more leak fixes

gnustep · Mar 4, 2024 · e881334 · e881334
1 parent 619f902
commit e881334
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/Source/NSJSONSerialization.m b/Source/NSJSONSerialization.m
@@ -474,15 +474,18 @@
     {
       val = [NSMutableString new];
     }
+  // Consume the trailing "
+  consumeChar(state);
   if (!state->mutableStrings)
     {
       if (NO == [val makeImmutable])
         {
-          val = [val copy];
+	  NSString	*str = [val copy];
+
+	  RELEASE(val);
+          return str;
         }
     }
-  // Consume the trailing "
-  consumeChar(state);
   return val;
 }
 
@@ -549,10 +552,9 @@
           if (number != numberBuffer)
             {
               free(number);
-              number = numberBuffer;
             }
-            parseError(state);
-            return nil;
+	  parseError(state);
+	  return nil;
         }
       BUFFER(c);
       while (isdigit(c = consumeChar(state)))
@@ -1072,7 +1074,9 @@ + (NSData*) dataWithJSONObject: (id)obj
     {
       if (NULL != error)
 	{
-	  NSDictionary *userInfo = [[NSDictionary alloc] initWithObjectsAndKeys:
+	  NSDictionary *userInfo;
+
+	  userInfo = [NSDictionary dictionaryWithObjectsAndKeys:
 	    _(@"JSON writing error"), NSLocalizedDescriptionKey,
 	    nil];
 	  *error = [NSError errorWithDomain: NSCocoaErrorDomain