https://github.com/danieleteti/delphimvcframework/issues/754

danieleteti · Jun 9, 2024 · a44b26c · a44b26c
1 parent 636ad27
commit a44b26c
Showing 1 changed file with 23 additions and 21 deletions.
diff --git a/sources/MVCFramework.Serializer.JsonDataObjects.pas b/sources/MVCFramework.Serializer.JsonDataObjects.pas
@@ -1127,6 +1127,7 @@ procedure TMVCJsonDataObjectsSerializer.DeserializeCollection(const ASerializedL
         JsonBase := TJDOJsonObject.Parse(ASerializedList);
         if not(JsonBase is TJDOJsonObject) then
         begin
+          JsonBase.Free;
           raise EMVCSerializationException.CreateFmt('Invalid JSON. Expected %s got %s',
             [TJDOJsonObject.ClassName, JsonBase.ClassName]);
         end;
@@ -3576,7 +3577,7 @@ procedure TMVCJsonDataObjectsSerializer.DeserializeObject(const ASerializedObjec
   const AType: TMVCSerializationType; const AIgnoredAttributes: TMVCIgnoredList; const ARootNode: string);
 var
   JSONObject: TJDOJsonObject;
-  JsonBase: TJsonBaseObject;
+  JSONBase: TJsonBaseObject;
 begin
   if (ASerializedObject = EmptyStr) then
     raise EMVCException.Create(HTTP_STATUS.BadRequest, 'Invalid body');
@@ -3585,33 +3586,34 @@ procedure TMVCJsonDataObjectsSerializer.DeserializeObject(const ASerializedObjec
     Exit;
 
   try
-    JsonBase := TJDOJsonObject.Parse(ASerializedObject);
-    if not(JsonBase is TJDOJsonObject) then
-    begin
-      raise EMVCSerializationException.CreateFmt('Invalid JSON. Expected %s got %s',
-        [TJDOJsonObject.ClassName, JsonBase.ClassName]);
+    JSONBase := TJDOJsonObject.Parse(ASerializedObject);
+    try
+      if not(JSONBase is TJDOJsonObject) then
+      begin
+        raise EMVCSerializationException.CreateFmt('Invalid JSON. Expected %s got %s',
+          [TJDOJsonObject.ClassName, JSONBase.ClassName]);
+      end;
+      JSONObject := TJDOJsonObject(JSONBase);
+
+      if GetTypeSerializers.ContainsKey(AObject.ClassInfo) then
+      begin
+        GetTypeSerializers.Items[AObject.ClassInfo].DeserializeRoot(SelectRootNodeOrWholeObject(ARootNode, JSONObject),
+          AObject, [])
+      end
+      else
+      begin
+        JsonObjectToObject(SelectRootNodeOrWholeObject(ARootNode, JSONObject), AObject,
+          GetSerializationType(AObject, AType), AIgnoredAttributes);
+      end;
+    finally
+      JSONBase.Free;
     end;
-    JSONObject := TJDOJsonObject(JsonBase);
   except
     on E: EJsonParserException do
     begin
       raise EMVCException.Create(HTTP_STATUS.BadRequest, E.Message);
     end;
   end;
-  try
-    if GetTypeSerializers.ContainsKey(AObject.ClassInfo) then
-    begin
-      GetTypeSerializers.Items[AObject.ClassInfo].DeserializeRoot(SelectRootNodeOrWholeObject(ARootNode, JSONObject),
-        AObject, [])
-    end
-    else
-    begin
-      JsonObjectToObject(SelectRootNodeOrWholeObject(ARootNode, JSONObject), AObject,
-        GetSerializationType(AObject, AType), AIgnoredAttributes);
-    end;
-  finally
-    JSONObject.Free;
-  end;
 end;
 
 function TMVCJsonDataObjectsSerializer.GetDataSetFields(const ADataSet: TDataSet; const AIgnoredFields: TMVCIgnoredList;