From d06b64e4bd962a072e429d2119eab492f930bbbd Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Tue, 29 Oct 2013 19:41:30 +0000 Subject: [PATCH] replace incorrect boolean shortcircuits in multibyte escaping --- src/jsx_decoder.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jsx_decoder.erl b/src/jsx_decoder.erl index 18ce26a..83d16f2 100644 --- a/src/jsx_decoder.erl +++ b/src/jsx_decoder.erl @@ -658,12 +658,12 @@ unescape(<<$u, $d, A, B, C, ?rsolidus, $u, W, X, Y, Z, Rest/binary>>, Handler, A false -> ?error(<<$u, $d, A, B, C, ?rsolidus, $u, W, X, Y, Z, Rest/binary>>, Handler, Acc, Stack, Config) end; unescape(<<$u, $d, A, B, C, ?rsolidus, Rest/binary>>, Handler, Acc, Stack, Config) - when (A == $8 orelse A == $9 orelse A == $a orelse A == $b) andalso + when (A == $8 orelse A == $9 orelse A == $a orelse A == $b), ?is_hex(B), ?is_hex(C) -> incomplete(string, <>, Handler, Acc, Stack, Config); unescape(<<$u, $d, A, B, C>>, Handler, Acc, Stack, Config) - when (A == $8 orelse A == $9 orelse A == $a orelse A == $b) andalso + when (A == $8 orelse A == $9 orelse A == $a orelse A == $b), ?is_hex(B), ?is_hex(C) -> incomplete(string, <>, Handler, Acc, Stack, Config);