commit 350a6bf69e03d19fe996cba992b49556ae2ce8ab
author aPiecek <piecek@cesnet.cz> Tue May 25 07:59:10 2021 +0200
committer Michal Vasko <mvasko@cesnet.cz> Tue May 25 08:50:09 2021 +0200
tree dae8f9598bfb3a100014c7f8519cd97b8d46ef5b
parent 95485ea4036af9c93ac3bd756c8c20509a717d4e

json BUGFIX in lyjson_number

The minus sign was taken as part of the number, which is not correct
in this expression.

src/json.c

diff --git a/src/json.c b/src/json.c
index 3ff49c9..2ef1b5a 100644
--- a/src/json.c
+++ b/src/json.c
@@ -428,7 +428,7 @@
                 /* adding zeros at the end */
                 num_len = exponent + e_val;
                 dp_position = num_len; /* decimal point is behind the actual value */
-            } else if ((size_t)labs(e_val) < exponent) {
+            } else if ((size_t)labs(e_val) < (exponent - minus)) {
                 /* adding decimal point between the integer's digits */
                 num_len = exponent + 1;
                 dp_position = exponent + e_val;

tests/utests/basic/test_json.c

diff --git a/tests/utests/basic/test_json.c b/tests/utests/basic/test_json.c
index 96fcc05..211e506 100644
--- a/tests/utests/basic/test_json.c
+++ b/tests/utests/basic/test_json.c
@@ -132,6 +132,24 @@
     assert_int_equal(1, jsonctx->dynamic);
     lyjson_ctx_free(jsonctx);
 
+    str = "15E-2";
+    assert_non_null(ly_in_memory(in, str));
+    assert_int_equal(LY_SUCCESS, lyjson_ctx_new(UTEST_LYCTX, in, &jsonctx));
+    assert_int_equal(LYJSON_NUMBER, lyjson_ctx_status(jsonctx, 0));
+    assert_string_equal("0.15", jsonctx->value);
+    assert_int_equal(4, jsonctx->value_len);
+    assert_int_equal(1, jsonctx->dynamic);
+    lyjson_ctx_free(jsonctx);
+
+    str = "-15E-2";
+    assert_non_null(ly_in_memory(in, str));
+    assert_int_equal(LY_SUCCESS, lyjson_ctx_new(UTEST_LYCTX, in, &jsonctx));
+    assert_int_equal(LYJSON_NUMBER, lyjson_ctx_status(jsonctx, 0));
+    assert_string_equal("-0.15", jsonctx->value);
+    assert_int_equal(5, jsonctx->value_len);
+    assert_int_equal(1, jsonctx->dynamic);
+    lyjson_ctx_free(jsonctx);
+
     str = "15E-3";
     assert_non_null(ly_in_memory(in, str));
     assert_int_equal(LY_SUCCESS, lyjson_ctx_new(UTEST_LYCTX, in, &jsonctx));