Merge pull request #81 from sile/fix-json-utf8-encoding-bug

Fix `jsone:try_encode({{json_utf8, IncompleteUtf8}})` raises a `try_clause` exception.
sile · Sep 21, 2023 · edff49e · edff49e
2 parents 8250f55 + caec6ba
commit edff49e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,10 +13,10 @@ jobs:
     runs-on: ${{matrix.os}}
     strategy:
       matrix:
-        otp: ['24.0', '25.0']
+        otp: ['24.0', '25.0', '26.0']
         os: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           otp-version: ${{matrix.otp}}
@@ -31,7 +31,7 @@ jobs:
     needs: ci
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           otp-version: '25.0'

diff --git a/src/jsone_encode.erl b/src/jsone_encode.erl
@@ -143,6 +143,9 @@ value({{json_utf8, T}}, Nexts, Buf, Opt) ->
         {error, OK, Invalid} ->
             {error, {{invalid_json_utf8, OK, Invalid},
                      [{?MODULE, value, [{json_utf8, T}, Nexts, Buf, Opt], [{line, ?LINE}]}]}};
+        {incomplete, OK, Incomplete} ->
+            {error, {{invalid_json_utf8, OK, Incomplete},
+                     [{?MODULE, value, [{json_utf8, T}, Nexts, Buf, Opt], [{line, ?LINE}]}]}};
         B when is_binary(B) ->
             next(Nexts, <<Buf/binary, B/binary>>, Opt)
     catch

diff --git a/test/jsone_encode_tests.erl b/test/jsone_encode_tests.erl
@@ -38,7 +38,11 @@ encode_test_() ->
                                                      <<"bar">>,
                                                      {{json, [$", 233, "ok", $"]}}))),
               ?assertEqual({ok, <<"{\"json\":\"[1,2,3]\"}">>}, jsone_encode:encode([{json, <<"[1,2,3]">>}])),
-              ?assertEqual({ok, <<"[[1,2,3]]">>}, jsone_encode:encode([{{json, <<"[1,2,3]">>}}]))
+              ?assertEqual({ok, <<"[[1,2,3]]">>}, jsone_encode:encode([{{json, <<"[1,2,3]">>}}])),
+
+              %% Errors
+              ?assertMatch({error, {{invalid_json_utf8, _, _}, _}}, jsone_encode:encode({{json_utf8, <<200, 83, 1>>}})),
+              ?assertMatch({error, {{invalid_json_utf8, _, _}, _}}, jsone_encode:encode({{json_utf8, <<"abc", 192>>}}))
       end},
      %% Numbers: Integer
      {"zero", fun() -> ?assertEqual({ok, <<"0">>}, jsone_encode:encode(0)) end},