Merge commit '6fb1dd339bb385b6b30c20464fcabe318e1c80d6'

Author: bpintea

libs/ujson4c/3rdparty/ultrajson.h

@@ -294,6 +294,7 @@ typedef struct __JSONObjectDecoder
   JSOBJ (*newArray)(void *prv);
   JSOBJ (*newInt)(void *prv, JSINT32 value);
   JSOBJ (*newLong)(void *prv, JSINT64 value);
+  JSOBJ (*newUnsignedLong)(void *prv, JSUINT64 value);
   JSOBJ (*newDouble)(void *prv, double value);
   void (*releaseObject)(void *prv, JSOBJ obj);
   JSPFN_MALLOC malloc;

libs/ujson4c/3rdparty/ultrajsondec.c

@@ -102,7 +102,7 @@ FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_numeric (struct DecoderState *ds)
 {
   int intNeg = 1;
   int mantSize = 0;
-  JSUINT64 intValue;
+  JSUINT64 intValue, chrValue;
   int chr;
   int decimalCount = 0;
   double frcValue = 0.0;
@@ -139,14 +139,13 @@ FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_numeric (struct DecoderState *ds)
       case '8':
       case '9':
       {
-        //FIXME: Check for arithemtic overflow here
-        //PERF: Don't do 64-bit arithmetic here unless we know we have to
-        intValue = intValue * 10ULL + (JSLONG) (chr - 48);
-
-        if (intValue > overflowLimit)
+        chrValue = chr - '0';
+        if (intValue > (ULLONG_MAX - chrValue) / 10ULL)
         {
-          return SetError(ds, -1, overflowLimit == LLONG_MAX ? "Value is too big" : "Value is too small");
+          return SetError(ds, -1, intNeg > 0 ? "Value is too big" :
+              "Value is too small");
         }
+        intValue = intValue * 10ULL + chrValue;
 
         offset ++;
         mantSize ++;
@@ -181,7 +180,17 @@ FASTCALL_ATTR JSOBJ FASTCALL_MSVC decode_numeric (struct DecoderState *ds)
 
   if ((intValue >> 31))
   {
-    return ds->dec->newLong(ds->prv, (JSINT64) (intValue * (JSINT64) intNeg));
+    if (intNeg > 0)
+    {
+      return (intValue > LLONG_MAX)
+        ? ds->dec->newUnsignedLong(ds->prv, intValue)
+        : ds->dec->newLong(ds->prv, (JSINT64) intValue);
+    }
+    else if (intValue > LLONG_MIN)
+    {
+      return SetError(ds, -1, "Value is too small");
+    }
+    return ds->dec->newLong(ds->prv, -(JSINT64)intValue);
   }
   else
   {

libs/ujson4c/src/ujdecode.c

@@ -90,6 +90,12 @@ typedef struct __LongLongValue
 	long long value;
 } LongLongValue;
 
+typedef struct __UnsignedLongLongValue
+{
+	Item item;
+	unsigned long long value;
+} UnsignedLongLongValue;
+
 typedef struct __DoubleValue
 {
 	Item item;
@@ -143,6 +149,9 @@ static void *alloc(struct DecoderState *ds, size_t cbSize)
 			newSize *= 2;
 
 		newSlab = (HeapSlab *) ds->malloc(newSize);
+		if (! newSlab) {
+			return NULL;
+		}
 		newSlab->start = (unsigned char *) (newSlab + 1);
 		newSlab->end = (unsigned char *) newSlab + newSize;
 		newSlab->size = newSize;
@@ -297,6 +306,18 @@ static JSOBJ newLong(void *context, JSINT64 value)
 	return (JSOBJ) llv;
 }
 
+static JSOBJ newUnsignedLong(void *context, JSUINT64 value)
+{
+	struct DecoderState *ds = context;
+	UnsignedLongLongValue *llv =
+		(UnsignedLongLongValue *) alloc(ds, sizeof(UnsignedLongLongValue));
+	if (llv) {
+		llv->item.type = UJT_UnsignedLongLong;
+		llv->value = (long long unsigned) value;
+	}
+	return (JSOBJ) llv;
+}
+
 static JSOBJ newDouble(void *context, double value)
 {
 	struct DecoderState *ds = context;
@@ -329,6 +350,11 @@ static long long GetLongLong(UJObject obj)
 	return ((LongLongValue *) obj)->value;
 }
 
+static unsigned long long GetUnsignedLongLong(UJObject obj)
+{
+	return ((UnsignedLongLongValue *) obj)->value;
+}
+
 void UJFree(void *state)
 {
 	struct DecoderState *ds = (struct DecoderState *) state;
@@ -518,12 +544,27 @@ int UJIterObject(void **iter, UJString *outKey, UJObject *outValue)
 	return 1;
 }
 
+unsigned long long UJNumericUnsignedLongLong(UJObject obj)
+{
+	switch ( ((Item *) obj)->type)
+	{
+	case UJT_Long: return (unsigned long long) GetLong(obj);
+	case UJT_LongLong: return (unsigned long long) GetLongLong(obj);
+	case UJT_UnsignedLongLong: return GetUnsignedLongLong(obj);
+	case UJT_Double: return (unsigned long long) GetDouble(obj);
+	default: break;
+	}
+
+	return 0;
+}
+
 long long UJNumericLongLong(UJObject obj)
 {
 	switch ( ((Item *) obj)->type)
 	{
 	case UJT_Long: return (long long) GetLong(obj);
 	case UJT_LongLong: return (long long) GetLongLong(obj);
+	case UJT_UnsignedLongLong: return (long long) GetUnsignedLongLong(obj);
 	case UJT_Double: return (long long) GetDouble(obj);
 	default: break;
 	}
@@ -537,6 +578,7 @@ int UJNumericInt(UJObject obj)
 	{
 	case UJT_Long: return (int) GetLong(obj);
 	case UJT_LongLong: return (int) GetLongLong(obj);
+	case UJT_UnsignedLongLong: return (int) GetUnsignedLongLong(obj);
 	case UJT_Double: return (int) GetDouble(obj);
 	default: break;
 	}
@@ -550,6 +592,7 @@ double UJNumericFloat(UJObject obj)
 	{
 	case UJT_Long: return (double) GetLong(obj);
 	case UJT_LongLong: return (double) GetLongLong(obj);
+	case UJT_UnsignedLongLong: return (double) GetUnsignedLongLong(obj);
 	case UJT_Double: return (double) GetDouble(obj);
 	default: break;
 	}
@@ -781,6 +824,7 @@ UJObject UJDecode(const char *input, size_t cbInput, UJHeapFuncs *hf, void **out
 		newArray,
 		newInt,
 		newLong,
+		newUnsignedLong,
 		newDouble,
 		releaseObject,
 		NULL,

libs/ujson4c/src/ujdecode.h

@@ -45,6 +45,7 @@ extern "C" {
 		UJT_False,
 		UJT_Long,
 		UJT_LongLong,
+		UJT_UnsignedLongLong,
 		UJT_Double,
 		UJT_String,
 		UJT_Array,
@@ -241,6 +242,7 @@ extern "C" {
 	converting doubles to integers.
 	===============================================================================
 	*/
+	unsigned long long UJNumericUnsignedLongLong(UJObject obj);
 	long long UJNumericLongLong(UJObject obj);
 	int UJNumericInt(UJObject obj);