Fix broken number parsing in fromJSON

The call to tmp_number.append had its arguments mixed up. Also, JSON
does not allow a trailing "," after array/object members.

1 files changed, 3 insertions, 4 deletions

diff --git a/src/libexpr/json-to-value.cc b/src/libexpr/json-to-value.cc
index 7ef2b2c56227..1daf84600dca 100644
--- a/src/libexpr/json-to-value.cc
+++ b/src/libexpr/json-to-value.cc
@@ -113,14 +113,13 @@ static void parseJSON(EvalState & state, const char * & s, Value & v)
         while (isdigit(*s) || *s == '-' || *s == '.' || *s == 'e' || *s == 'E') {
             if (*s == '.' || *s == 'e' || *s == 'E')
                 number_type = tFloat;
-            tmp_number.append(*s++, 1);
+            tmp_number += *s++;
         }
 
-        if (number_type == tFloat) {
+        if (number_type == tFloat)
             mkFloat(v, stod(tmp_number));
-        } else {
+        else
             mkInt(v, stoi(tmp_number));
-        }
     }
 
     else if (strncmp(s, "true", 4) == 0) {