diff --git a/src/jsx_encoder.erl b/src/jsx_encoder.erl index cc43a1a..397b99d 100644 --- a/src/jsx_encoder.erl +++ b/src/jsx_encoder.erl @@ -104,102 +104,393 @@ fix_key(Key) when is_binary(Key) -> Key. clean_string(Bin, Opts) -> - case Opts#opts.loose_unicode of - true -> maybe_escape(clean_string(Bin, 0, size(Bin), Opts), Opts) - ; false -> - case is_clean(Bin) of - true -> maybe_escape(Bin, Opts) - ; false -> erlang:error(badarg, [Bin, Opts]) - end + case Opts#opts.loose_unicode orelse Opts#opts.json_escape of + true -> clean(Bin, [], Opts) + ; false -> ensure_clean(Bin), Bin end. -maybe_escape(Bin, Opts=#opts{json_escape=true}) -> jsx_utils:json_escape(Bin, Opts); -maybe_escape(Bin, _) -> Bin. +%% fast path for no escaping and no correcting, throws error if string is 'bad' +ensure_clean(<<>>) -> ok; +ensure_clean(<<0, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<1, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<2, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<3, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<4, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<5, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<6, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<7, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<8, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<9, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<10, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<11, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<12, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<13, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<14, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<15, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<16, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<17, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<18, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<19, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<20, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<21, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<22, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<23, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<24, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<25, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<26, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<27, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<28, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<29, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<30, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<31, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<32, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<33, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<34, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<35, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<36, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<37, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<38, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<39, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<40, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<41, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<42, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<43, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<44, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<45, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<46, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<47, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<48, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<49, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<50, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<51, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<52, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<53, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<54, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<55, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<56, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<57, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<58, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<59, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<60, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<61, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<62, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<63, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<64, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<65, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<66, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<67, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<68, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<69, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<70, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<71, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<72, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<73, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<74, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<75, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<76, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<77, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<78, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<79, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<80, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<81, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<82, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<83, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<84, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<85, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<86, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<87, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<88, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<89, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<90, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<91, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<92, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<93, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<94, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<95, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<96, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<97, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<98, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<99, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<100, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<101, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<102, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<103, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<104, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<105, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<106, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<107, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<108, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<109, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<110, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<111, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<112, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<113, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<114, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<115, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<116, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<117, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<118, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<119, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<120, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<121, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<122, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<123, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<124, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<125, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<126, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<<127, Rest/binary>>) -> ensure_clean(Rest); +ensure_clean(<>) when X < 16#800 -> ensure_clean(Rest); +ensure_clean(<>) when X < 16#dcff -> ensure_clean(Rest); +ensure_clean(<>) when X > 16#dfff, X < 16#fdd0 -> ensure_clean(Rest); +ensure_clean(<>) when X > 16#fdef, X < 16#fffe -> ensure_clean(Rest); +ensure_clean(<>) when X >= 16#10000, X < 16#1fffe -> ensure_clean(Rest); +ensure_clean(<>) when X >= 16#20000, X < 16#2fffe -> ensure_clean(Rest); +ensure_clean(<>) when X >= 16#30000, X < 16#3fffe -> ensure_clean(Rest); +ensure_clean(<>) when X >= 16#40000, X < 16#4fffe -> ensure_clean(Rest); +ensure_clean(<>) when X >= 16#50000, X < 16#5fffe -> ensure_clean(Rest); +ensure_clean(<>) when X >= 16#60000, X < 16#6fffe -> ensure_clean(Rest); +ensure_clean(<>) when X >= 16#70000, X < 16#7fffe -> ensure_clean(Rest); +ensure_clean(<>) when X >= 16#80000, X < 16#8fffe -> ensure_clean(Rest); +ensure_clean(<>) when X >= 16#90000, X < 16#9fffe -> ensure_clean(Rest); +ensure_clean(<>) when X >= 16#a0000, X < 16#afffe -> ensure_clean(Rest); +ensure_clean(<>) when X >= 16#b0000, X < 16#bfffe -> ensure_clean(Rest); +ensure_clean(<>) when X >= 16#c0000, X < 16#cfffe -> ensure_clean(Rest); +ensure_clean(<>) when X >= 16#d0000, X < 16#dfffe -> ensure_clean(Rest); +ensure_clean(<>) when X >= 16#e0000, X < 16#efffe -> ensure_clean(Rest); +ensure_clean(<>) when X >= 16#f0000, X < 16#ffffe -> ensure_clean(Rest); +ensure_clean(<>) when X >= 16#100000, X < 16#10fffe -> ensure_clean(Rest); +ensure_clean(Bin) -> erlang:error(badarg, [Bin]). -is_clean(<<>>) -> true; -is_clean(<>) when X < 16#80 -> is_clean(Rest); -is_clean(<>) when X < 16#800 -> is_clean(Rest); -is_clean(<>) when X < 16#dcff -> is_clean(Rest); -is_clean(<>) when X > 16#dfff, X < 16#fdd0 -> is_clean(Rest); -is_clean(<>) when X > 16#fdef, X < 16#fffe -> is_clean(Rest); -is_clean(<>) when X >= 16#10000, X < 16#1fffe -> is_clean(Rest); -is_clean(<>) when X >= 16#20000, X < 16#2fffe -> is_clean(Rest); -is_clean(<>) when X >= 16#30000, X < 16#3fffe -> is_clean(Rest); -is_clean(<>) when X >= 16#40000, X < 16#4fffe -> is_clean(Rest); -is_clean(<>) when X >= 16#50000, X < 16#5fffe -> is_clean(Rest); -is_clean(<>) when X >= 16#60000, X < 16#6fffe -> is_clean(Rest); -is_clean(<>) when X >= 16#70000, X < 16#7fffe -> is_clean(Rest); -is_clean(<>) when X >= 16#80000, X < 16#8fffe -> is_clean(Rest); -is_clean(<>) when X >= 16#90000, X < 16#9fffe -> is_clean(Rest); -is_clean(<>) when X >= 16#a0000, X < 16#afffe -> is_clean(Rest); -is_clean(<>) when X >= 16#b0000, X < 16#bfffe -> is_clean(Rest); -is_clean(<>) when X >= 16#c0000, X < 16#cfffe -> is_clean(Rest); -is_clean(<>) when X >= 16#d0000, X < 16#dfffe -> is_clean(Rest); -is_clean(<>) when X >= 16#e0000, X < 16#efffe -> is_clean(Rest); -is_clean(<>) when X >= 16#f0000, X < 16#ffffe -> is_clean(Rest); -is_clean(<>) when X >= 16#100000, X < 16#10fffe -> is_clean(Rest); -is_clean(Bin) -> erlang:error(badarg, [Bin]). +%% escape and/or replace bad codepoints if requested +clean(<<>>, Acc, _Opts) -> unicode:characters_to_binary(lists:reverse(Acc)); +clean(<<0, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(0, Opts) ++ Acc, Opts); +clean(<<1, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(1, Opts) ++ Acc, Opts); +clean(<<2, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(2, Opts) ++ Acc, Opts); +clean(<<3, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(3, Opts) ++ Acc, Opts); +clean(<<4, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(4, Opts) ++ Acc, Opts); +clean(<<5, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(5, Opts) ++ Acc, Opts); +clean(<<6, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(6, Opts) ++ Acc, Opts); +clean(<<7, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(7, Opts) ++ Acc, Opts); +clean(<<8, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(8, Opts) ++ Acc, Opts); +clean(<<9, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(9, Opts) ++ Acc, Opts); +clean(<<10, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(10, Opts) ++ Acc, Opts); +clean(<<11, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(11, Opts) ++ Acc, Opts); +clean(<<12, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(12, Opts) ++ Acc, Opts); +clean(<<13, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(13, Opts) ++ Acc, Opts); +clean(<<14, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(14, Opts) ++ Acc, Opts); +clean(<<15, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(15, Opts) ++ Acc, Opts); +clean(<<16, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(16, Opts) ++ Acc, Opts); +clean(<<17, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(17, Opts) ++ Acc, Opts); +clean(<<18, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(18, Opts) ++ Acc, Opts); +clean(<<19, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(19, Opts) ++ Acc, Opts); +clean(<<20, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(20, Opts) ++ Acc, Opts); +clean(<<21, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(21, Opts) ++ Acc, Opts); +clean(<<22, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(22, Opts) ++ Acc, Opts); +clean(<<23, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(23, Opts) ++ Acc, Opts); +clean(<<24, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(24, Opts) ++ Acc, Opts); +clean(<<25, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(25, Opts) ++ Acc, Opts); +clean(<<26, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(26, Opts) ++ Acc, Opts); +clean(<<27, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(27, Opts) ++ Acc, Opts); +clean(<<28, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(28, Opts) ++ Acc, Opts); +clean(<<29, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(29, Opts) ++ Acc, Opts); +clean(<<30, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(30, Opts) ++ Acc, Opts); +clean(<<31, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(31, Opts) ++ Acc, Opts); +clean(<<32, Rest/binary>>, Acc, Opts) -> clean(Rest, [32] ++ Acc, Opts); +clean(<<33, Rest/binary>>, Acc, Opts) -> clean(Rest, [33] ++ Acc, Opts); +clean(<<34, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(34, Opts) ++ Acc, Opts); +clean(<<35, Rest/binary>>, Acc, Opts) -> clean(Rest, [35] ++ Acc, Opts); +clean(<<36, Rest/binary>>, Acc, Opts) -> clean(Rest, [36] ++ Acc, Opts); +clean(<<37, Rest/binary>>, Acc, Opts) -> clean(Rest, [37] ++ Acc, Opts); +clean(<<38, Rest/binary>>, Acc, Opts) -> clean(Rest, [38] ++ Acc, Opts); +clean(<<39, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(39, Opts) ++ Acc, Opts); +clean(<<40, Rest/binary>>, Acc, Opts) -> clean(Rest, [40] ++ Acc, Opts); +clean(<<41, Rest/binary>>, Acc, Opts) -> clean(Rest, [41] ++ Acc, Opts); +clean(<<42, Rest/binary>>, Acc, Opts) -> clean(Rest, [42] ++ Acc, Opts); +clean(<<43, Rest/binary>>, Acc, Opts) -> clean(Rest, [43] ++ Acc, Opts); +clean(<<44, Rest/binary>>, Acc, Opts) -> clean(Rest, [44] ++ Acc, Opts); +clean(<<45, Rest/binary>>, Acc, Opts) -> clean(Rest, [45] ++ Acc, Opts); +clean(<<46, Rest/binary>>, Acc, Opts) -> clean(Rest, [46] ++ Acc, Opts); +clean(<<47, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(47, Opts) ++ Acc, Opts); +clean(<<48, Rest/binary>>, Acc, Opts) -> clean(Rest, [48] ++ Acc, Opts); +clean(<<49, Rest/binary>>, Acc, Opts) -> clean(Rest, [49] ++ Acc, Opts); +clean(<<50, Rest/binary>>, Acc, Opts) -> clean(Rest, [50] ++ Acc, Opts); +clean(<<51, Rest/binary>>, Acc, Opts) -> clean(Rest, [51] ++ Acc, Opts); +clean(<<52, Rest/binary>>, Acc, Opts) -> clean(Rest, [52] ++ Acc, Opts); +clean(<<53, Rest/binary>>, Acc, Opts) -> clean(Rest, [53] ++ Acc, Opts); +clean(<<54, Rest/binary>>, Acc, Opts) -> clean(Rest, [54] ++ Acc, Opts); +clean(<<55, Rest/binary>>, Acc, Opts) -> clean(Rest, [55] ++ Acc, Opts); +clean(<<56, Rest/binary>>, Acc, Opts) -> clean(Rest, [56] ++ Acc, Opts); +clean(<<57, Rest/binary>>, Acc, Opts) -> clean(Rest, [57] ++ Acc, Opts); +clean(<<58, Rest/binary>>, Acc, Opts) -> clean(Rest, [58] ++ Acc, Opts); +clean(<<59, Rest/binary>>, Acc, Opts) -> clean(Rest, [59] ++ Acc, Opts); +clean(<<60, Rest/binary>>, Acc, Opts) -> clean(Rest, [60] ++ Acc, Opts); +clean(<<61, Rest/binary>>, Acc, Opts) -> clean(Rest, [61] ++ Acc, Opts); +clean(<<62, Rest/binary>>, Acc, Opts) -> clean(Rest, [62] ++ Acc, Opts); +clean(<<63, Rest/binary>>, Acc, Opts) -> clean(Rest, [63] ++ Acc, Opts); +clean(<<64, Rest/binary>>, Acc, Opts) -> clean(Rest, [64] ++ Acc, Opts); +clean(<<65, Rest/binary>>, Acc, Opts) -> clean(Rest, [65] ++ Acc, Opts); +clean(<<66, Rest/binary>>, Acc, Opts) -> clean(Rest, [66] ++ Acc, Opts); +clean(<<67, Rest/binary>>, Acc, Opts) -> clean(Rest, [67] ++ Acc, Opts); +clean(<<68, Rest/binary>>, Acc, Opts) -> clean(Rest, [68] ++ Acc, Opts); +clean(<<69, Rest/binary>>, Acc, Opts) -> clean(Rest, [69] ++ Acc, Opts); +clean(<<70, Rest/binary>>, Acc, Opts) -> clean(Rest, [70] ++ Acc, Opts); +clean(<<71, Rest/binary>>, Acc, Opts) -> clean(Rest, [71] ++ Acc, Opts); +clean(<<72, Rest/binary>>, Acc, Opts) -> clean(Rest, [72] ++ Acc, Opts); +clean(<<73, Rest/binary>>, Acc, Opts) -> clean(Rest, [73] ++ Acc, Opts); +clean(<<74, Rest/binary>>, Acc, Opts) -> clean(Rest, [74] ++ Acc, Opts); +clean(<<75, Rest/binary>>, Acc, Opts) -> clean(Rest, [75] ++ Acc, Opts); +clean(<<76, Rest/binary>>, Acc, Opts) -> clean(Rest, [76] ++ Acc, Opts); +clean(<<77, Rest/binary>>, Acc, Opts) -> clean(Rest, [77] ++ Acc, Opts); +clean(<<78, Rest/binary>>, Acc, Opts) -> clean(Rest, [78] ++ Acc, Opts); +clean(<<79, Rest/binary>>, Acc, Opts) -> clean(Rest, [79] ++ Acc, Opts); +clean(<<80, Rest/binary>>, Acc, Opts) -> clean(Rest, [80] ++ Acc, Opts); +clean(<<81, Rest/binary>>, Acc, Opts) -> clean(Rest, [81] ++ Acc, Opts); +clean(<<82, Rest/binary>>, Acc, Opts) -> clean(Rest, [82] ++ Acc, Opts); +clean(<<83, Rest/binary>>, Acc, Opts) -> clean(Rest, [83] ++ Acc, Opts); +clean(<<84, Rest/binary>>, Acc, Opts) -> clean(Rest, [84] ++ Acc, Opts); +clean(<<85, Rest/binary>>, Acc, Opts) -> clean(Rest, [85] ++ Acc, Opts); +clean(<<86, Rest/binary>>, Acc, Opts) -> clean(Rest, [86] ++ Acc, Opts); +clean(<<87, Rest/binary>>, Acc, Opts) -> clean(Rest, [87] ++ Acc, Opts); +clean(<<88, Rest/binary>>, Acc, Opts) -> clean(Rest, [88] ++ Acc, Opts); +clean(<<89, Rest/binary>>, Acc, Opts) -> clean(Rest, [89] ++ Acc, Opts); +clean(<<90, Rest/binary>>, Acc, Opts) -> clean(Rest, [90] ++ Acc, Opts); +clean(<<91, Rest/binary>>, Acc, Opts) -> clean(Rest, [91] ++ Acc, Opts); +clean(<<92, Rest/binary>>, Acc, Opts) -> clean(Rest, maybe_replace(92, Opts) ++ Acc, Opts); +clean(<<93, Rest/binary>>, Acc, Opts) -> clean(Rest, [93] ++ Acc, Opts); +clean(<<94, Rest/binary>>, Acc, Opts) -> clean(Rest, [94] ++ Acc, Opts); +clean(<<95, Rest/binary>>, Acc, Opts) -> clean(Rest, [95] ++ Acc, Opts); +clean(<<96, Rest/binary>>, Acc, Opts) -> clean(Rest, [96] ++ Acc, Opts); +clean(<<97, Rest/binary>>, Acc, Opts) -> clean(Rest, [97] ++ Acc, Opts); +clean(<<98, Rest/binary>>, Acc, Opts) -> clean(Rest, [98] ++ Acc, Opts); +clean(<<99, Rest/binary>>, Acc, Opts) -> clean(Rest, [99] ++ Acc, Opts); +clean(<<100, Rest/binary>>, Acc, Opts) -> clean(Rest, [100] ++ Acc, Opts); +clean(<<101, Rest/binary>>, Acc, Opts) -> clean(Rest, [101] ++ Acc, Opts); +clean(<<102, Rest/binary>>, Acc, Opts) -> clean(Rest, [102] ++ Acc, Opts); +clean(<<103, Rest/binary>>, Acc, Opts) -> clean(Rest, [103] ++ Acc, Opts); +clean(<<104, Rest/binary>>, Acc, Opts) -> clean(Rest, [104] ++ Acc, Opts); +clean(<<105, Rest/binary>>, Acc, Opts) -> clean(Rest, [105] ++ Acc, Opts); +clean(<<106, Rest/binary>>, Acc, Opts) -> clean(Rest, [106] ++ Acc, Opts); +clean(<<107, Rest/binary>>, Acc, Opts) -> clean(Rest, [107] ++ Acc, Opts); +clean(<<108, Rest/binary>>, Acc, Opts) -> clean(Rest, [108] ++ Acc, Opts); +clean(<<109, Rest/binary>>, Acc, Opts) -> clean(Rest, [109] ++ Acc, Opts); +clean(<<110, Rest/binary>>, Acc, Opts) -> clean(Rest, [110] ++ Acc, Opts); +clean(<<111, Rest/binary>>, Acc, Opts) -> clean(Rest, [111] ++ Acc, Opts); +clean(<<112, Rest/binary>>, Acc, Opts) -> clean(Rest, [112] ++ Acc, Opts); +clean(<<113, Rest/binary>>, Acc, Opts) -> clean(Rest, [113] ++ Acc, Opts); +clean(<<114, Rest/binary>>, Acc, Opts) -> clean(Rest, [114] ++ Acc, Opts); +clean(<<115, Rest/binary>>, Acc, Opts) -> clean(Rest, [115] ++ Acc, Opts); +clean(<<116, Rest/binary>>, Acc, Opts) -> clean(Rest, [116] ++ Acc, Opts); +clean(<<117, Rest/binary>>, Acc, Opts) -> clean(Rest, [117] ++ Acc, Opts); +clean(<<118, Rest/binary>>, Acc, Opts) -> clean(Rest, [118] ++ Acc, Opts); +clean(<<119, Rest/binary>>, Acc, Opts) -> clean(Rest, [119] ++ Acc, Opts); +clean(<<120, Rest/binary>>, Acc, Opts) -> clean(Rest, [120] ++ Acc, Opts); +clean(<<121, Rest/binary>>, Acc, Opts) -> clean(Rest, [121] ++ Acc, Opts); +clean(<<122, Rest/binary>>, Acc, Opts) -> clean(Rest, [122] ++ Acc, Opts); +clean(<<123, Rest/binary>>, Acc, Opts) -> clean(Rest, [123] ++ Acc, Opts); +clean(<<124, Rest/binary>>, Acc, Opts) -> clean(Rest, [124] ++ Acc, Opts); +clean(<<125, Rest/binary>>, Acc, Opts) -> clean(Rest, [125] ++ Acc, Opts); +clean(<<126, Rest/binary>>, Acc, Opts) -> clean(Rest, [126] ++ Acc, Opts); +clean(<<127, Rest/binary>>, Acc, Opts) -> clean(Rest, [127] ++ Acc, Opts); +clean(<>, Acc, Opts) when X < 16#800 -> + clean(Rest, [X] ++ Acc, Opts); +clean(<>, Acc, Opts) when X == 16#2028; X == 16#2029 -> + clean(Rest, maybe_replace(X, Opts) ++ Acc, Opts); +clean(<>, Acc, Opts) when X < 16#dcff -> + clean(Rest, [X] ++ Acc, Opts); +clean(<>, Acc, Opts) when X > 16#dfff, X < 16#fdd0 -> + clean(Rest, [X] ++ Acc, Opts); +clean(<>, Acc, Opts) when X > 16#fdef, X < 16#fffe -> + clean(Rest, [X] ++ Acc, Opts); +clean(<>, Acc, Opts) when X >= 16#10000, X < 16#1fffe -> + clean(Rest, [X] ++ Acc, Opts); +clean(<>, Acc, Opts) when X >= 16#20000, X < 16#2fffe -> + clean(Rest, [X] ++ Acc, Opts); +clean(<>, Acc, Opts) when X >= 16#30000, X < 16#3fffe -> + clean(Rest, [X] ++ Acc, Opts); +clean(<>, Acc, Opts) when X >= 16#40000, X < 16#4fffe -> + clean(Rest, [X] ++ Acc, Opts); +clean(<>, Acc, Opts) when X >= 16#50000, X < 16#5fffe -> + clean(Rest, [X] ++ Acc, Opts); +clean(<>, Acc, Opts) when X >= 16#60000, X < 16#6fffe -> + clean(Rest, [X] ++ Acc, Opts); +clean(<>, Acc, Opts) when X >= 16#70000, X < 16#7fffe -> + clean(Rest, [X] ++ Acc, Opts); +clean(<>, Acc, Opts) when X >= 16#80000, X < 16#8fffe -> + clean(Rest, [X] ++ Acc, Opts); +clean(<>, Acc, Opts) when X >= 16#90000, X < 16#9fffe -> + clean(Rest, [X] ++ Acc, Opts); +clean(<>, Acc, Opts) when X >= 16#a0000, X < 16#afffe -> + clean(Rest, [X] ++ Acc, Opts); +clean(<>, Acc, Opts) when X >= 16#b0000, X < 16#bfffe -> + clean(Rest, [X] ++ Acc, Opts); +clean(<>, Acc, Opts) when X >= 16#c0000, X < 16#cfffe -> + clean(Rest, [X] ++ Acc, Opts); +clean(<>, Acc, Opts) when X >= 16#d0000, X < 16#dfffe -> + clean(Rest, [X] ++ Acc, Opts); +clean(<>, Acc, Opts) when X >= 16#e0000, X < 16#efffe -> + clean(Rest, [X] ++ Acc, Opts); +clean(<>, Acc, Opts) when X >= 16#f0000, X < 16#ffffe -> + clean(Rest, [X] ++ Acc, Opts); +clean(<>, Acc, Opts) when X >= 16#100000, X < 16#10fffe -> + clean(Rest, [X] ++ Acc, Opts); +%% noncharacters +clean(<<_/utf8, Rest/binary>>, Acc, Opts) -> + clean(Rest, maybe_replace(noncharacter, Opts) ++ Acc, Opts); +%% surrogates +clean(<<237, X, _, Rest/binary>>, Acc, Opts) when X >= 160 -> + clean(Rest, maybe_replace(surrogate, Opts) ++ Acc, Opts); +%% u+fffe and u+ffff for R14BXX +clean(<<239, 191, X, Rest/binary>>, Acc, Opts) when X == 190; X == 191 -> + clean(Rest, maybe_replace(noncharacter, Opts) ++ Acc, Opts); +%% overlong encodings and missing continuations of a 2 byte sequence +clean(<>, Acc, Opts) when X >= 192, X =< 223 -> + clean(strip_continuations(Rest, 1), maybe_replace(badutf, Opts) ++ Acc, Opts); +%% overlong encodings and missing continuations of a 3 byte sequence +clean(<>, Acc, Opts) when X >= 224, X =< 239 -> + clean(strip_continuations(Rest, 2), maybe_replace(badutf, Opts) ++ Acc, Opts); +%% overlong encodings and missing continuations of a 4 byte sequence +clean(<>, Acc, Opts) when X >= 240, X =< 247 -> + clean(strip_continuations(Rest, 3), maybe_replace(badutf, Opts) ++ Acc, Opts); +clean(<<_, Rest/binary>>, Acc, Opts) -> + clean(Rest, maybe_replace(badutf, Opts) ++ Acc, Opts). -clean_string(Str, Len, Len, _Opts) -> Str; -clean_string(Str, L, Len, Opts) -> - case Str of - <<_:L/binary, X/utf8, _/binary>> when X < 16#80 -> clean_string(Str, L + 1, Len, Opts) - ; <<_:L/binary, X/utf8, _/binary>> when X < 16#800 -> clean_string(Str, L + 2, Len, Opts) - ; <<_:L/binary, X/utf8, _/binary>> when X < 16#dcff -> clean_string(Str, L + 3, Len, Opts) - ; <<_:L/binary, X/utf8, _/binary>> when X > 16#dfff, X < 16#fdd0 -> clean_string(Str, L + 3, Len, Opts) - ; <<_:L/binary, X/utf8, _/binary>> when X > 16#fdef, X < 16#fffe -> clean_string(Str, L + 3, Len, Opts) - ; <<_:L/binary, X/utf8, _/binary>> when X >= 16#10000, X < 16#1fffe -> clean_string(Str, L + 4, Len, Opts) - ; <<_:L/binary, X/utf8, _/binary>> when X >= 16#20000, X < 16#2fffe -> clean_string(Str, L + 4, Len, Opts) - ; <<_:L/binary, X/utf8, _/binary>> when X >= 16#30000, X < 16#3fffe -> clean_string(Str, L + 4, Len, Opts) - ; <<_:L/binary, X/utf8, _/binary>> when X >= 16#40000, X < 16#4fffe -> clean_string(Str, L + 4, Len, Opts) - ; <<_:L/binary, X/utf8, _/binary>> when X >= 16#50000, X < 16#5fffe -> clean_string(Str, L + 4, Len, Opts) - ; <<_:L/binary, X/utf8, _/binary>> when X >= 16#60000, X < 16#6fffe -> clean_string(Str, L + 4, Len, Opts) - ; <<_:L/binary, X/utf8, _/binary>> when X >= 16#70000, X < 16#7fffe -> clean_string(Str, L + 4, Len, Opts) - ; <<_:L/binary, X/utf8, _/binary>> when X >= 16#80000, X < 16#8fffe -> clean_string(Str, L + 4, Len, Opts) - ; <<_:L/binary, X/utf8, _/binary>> when X >= 16#90000, X < 16#9fffe -> clean_string(Str, L + 4, Len, Opts) - ; <<_:L/binary, X/utf8, _/binary>> when X >= 16#a0000, X < 16#afffe -> clean_string(Str, L + 4, Len, Opts) - ; <<_:L/binary, X/utf8, _/binary>> when X >= 16#b0000, X < 16#bfffe -> clean_string(Str, L + 4, Len, Opts) - ; <<_:L/binary, X/utf8, _/binary>> when X >= 16#c0000, X < 16#cfffe -> clean_string(Str, L + 4, Len, Opts) - ; <<_:L/binary, X/utf8, _/binary>> when X >= 16#d0000, X < 16#dfffe -> clean_string(Str, L + 4, Len, Opts) - ; <<_:L/binary, X/utf8, _/binary>> when X >= 16#e0000, X < 16#efffe -> clean_string(Str, L + 4, Len, Opts) - ; <<_:L/binary, X/utf8, _/binary>> when X >= 16#f0000, X < 16#ffffe -> clean_string(Str, L + 4, Len, Opts) - ; <<_:L/binary, X/utf8, _/binary>> when X >= 16#100000, X < 16#10fffe -> clean_string(Str, L + 4, Len, Opts) - %% noncharacters - ; <> when X < 16#10000 -> - clean_string(<>, L + 3, Len, Opts) - ; <> -> - clean_string(<>, L + 4, Len, Opts) - %% surrogates - ; <> when X >= 160 -> - clean_string(<>, L + 3, Len, Opts) - %% u+fffe and u+ffff for R14BXX - ; <> when X == 190; X == 191 -> - clean_string(<>, L + 3, Len, Opts) - %% overlong encodings and missing continuations of a 2 byte sequence - ; <> when X >= 192, X =< 223 -> - {Tail, Stripped} = strip_continuations(T, 1, 0), - clean_string(<>, L + 3, Len + 2 - Stripped, Opts) - %% overlong encodings and missing continuations of a 3 byte sequence - ; <> when X >= 224, X =< 239 -> - {Tail, Stripped} = strip_continuations(T, 2, 0), - clean_string(<>, L + 3, Len + 2 - Stripped, Opts) - %% overlong encodings and missing continuations of a 4 byte sequence - ; <> when X >= 240, X =< 247 -> - {Tail, Stripped} = strip_continuations(T, 3, 0), - clean_string(<>, L + 3, Len + 2 - Stripped, Opts) - ; <> -> - clean_string(<>, L + 3, Len + 2, Opts) - end. - - -strip_continuations(Bin, 0, N) -> {Bin, N}; -strip_continuations(<>, N, M) when X >= 128, X =< 191 -> - strip_continuations(Rest, N - 1, M + 1); +strip_continuations(Bin, 0) -> Bin; +strip_continuations(<>, N) when X >= 128, X =< 191 -> + strip_continuations(Rest, N - 1); %% not a continuation byte -strip_continuations(Bin, _, N) -> {Bin, N}. +strip_continuations(Bin, _) -> Bin. + + +maybe_replace($\b, #opts{json_escape=true}) -> [$b, $\\]; +maybe_replace($\t, #opts{json_escape=true}) -> [$t, $\\]; +maybe_replace($\n, #opts{json_escape=true}) -> [$n, $\\]; +maybe_replace($\f, #opts{json_escape=true}) -> [$f, $\\]; +maybe_replace($\r, #opts{json_escape=true}) -> [$r, $\\]; +maybe_replace($\", #opts{json_escape=true}) -> [$\", $\\]; +maybe_replace($', Opts=#opts{json_escape=true}) -> + case Opts#opts.single_quotes of + true -> [$', $\\] + ; false -> [$'] + end; +maybe_replace($/, Opts=#opts{json_escape=true}) -> + case Opts#opts.escape_forward_slash of + true -> [$/, $\\] + ; false -> [$/] + end; +maybe_replace($\\, #opts{json_escape=true}) -> [$\\, $\\]; +maybe_replace(X, Opts=#opts{json_escape=true}) when X == 16#2028; X == 16#2029 -> + case Opts#opts.no_jsonp_escapes of + true -> [X] + ; false -> lists:reverse(jsx_utils:json_escape_sequence(X)) + end; +maybe_replace(X, #opts{json_escape=true}) when X < 32 -> + lists:reverse(jsx_utils:json_escape_sequence(X)); +maybe_replace(noncharacter, #opts{loose_unicode=true}) -> [16#fffd]; +maybe_replace(surrogate, #opts{loose_unicode=true}) -> [16#fffd]; +maybe_replace(badutf, #opts{loose_unicode=true}) -> [16#fffd]. -ifdef(TEST). @@ -488,6 +779,31 @@ encode_test_() -> ]. +escapes_test_() -> + [ + {"backspace escape", ?_assertEqual(encode(<<"\b">>, [json_escape]), [{string, <<"\\b">>}, end_json])}, + {"formfeed escape", ?_assertEqual(encode(<<"\f">>, [json_escape]), [{string, <<"\\f">>}, end_json])}, + {"newline escape", ?_assertEqual(encode(<<"\n">>, [json_escape]), [{string, <<"\\n">>}, end_json])}, + {"carriage return escape", ?_assertEqual(encode(<<"\r">>, [json_escape]), [{string, <<"\\r">>}, end_json])}, + {"tab escape", ?_assertEqual(encode(<<"\t">>, [json_escape]), [{string, <<"\\t">>}, end_json])}, + {"quote escape", ?_assertEqual(encode(<<"\"">>, [json_escape]), [{string, <<"\\\"">>}, end_json])}, + {"single quote escape", ?_assertEqual(encode(<<"'">>, [json_escape, single_quotes]), [{string, <<"\\'">>}, end_json])}, + {"no single quote escape", ?_assertEqual(encode(<<"'">>, [json_escape]), [{string, <<"'">>}, end_json])}, + {"forward slash escape", ?_assertEqual(encode(<<"/">>, [json_escape, escape_forward_slash]), [{string, <<"\\/">>}, end_json])}, + {"no forward slash escape", ?_assertEqual(encode(<<"/">>, [json_escape]), [{string, <<"/">>}, end_json])}, + {"back slash escape", ?_assertEqual(encode(<<"\\">>, [json_escape]), [{string, <<"\\\\">>}, end_json])}, + {"jsonp escape", ?_assertEqual( + encode(<<16#2028/utf8, 16#2029/utf8>>, [json_escape]), + [{string, <<"\\u2028\\u2029">>}, end_json] + )}, + {"no jsonp escape", ?_assertEqual( + encode(<<16#2028/utf8, 16#2029/utf8>>, [json_escape, no_jsonp_escapes]), + [{string, <<16#2028/utf8, 16#2029/utf8>>}, end_json] + )}, + {"control escape", ?_assertEqual(encode(<<0>>, [json_escape]), [{string, <<"\\u0000">>}, end_json])} + ]. + + surrogates_test_() -> [ {"surrogates - badjson", diff --git a/src/jsx_utils.erl b/src/jsx_utils.erl index ac1c9f3..eb6fb0f 100644 --- a/src/jsx_utils.erl +++ b/src/jsx_utils.erl @@ -25,7 +25,7 @@ -export([parse_opts/1]). -export([extract_opts/1]). --export([json_escape/2]). +-export([json_escape/2, json_escape_sequence/1]). -include("jsx_opts.hrl"). @@ -321,7 +321,7 @@ json_escape(Str, _, L, Len) when L =:= Len -> %% convert a codepoint to it's \uXXXX equiv. json_escape_sequence(X) -> <> = <>, - unicode:characters_to_binary([$\\, $u, (to_hex(A)), (to_hex(B)), (to_hex(C)), (to_hex(D))]). + [$\\, $u, (to_hex(A)), (to_hex(B)), (to_hex(C)), (to_hex(D))]. to_hex(10) -> $a;