Merge pull request #133 from mateusvicente100/master

Bug Variant or safe array index out of bounds
viniciussanchez · Feb 14, 2022 · 6f07f2f · 6f07f2f
2 parents 58316ec + a1f375e
commit 6f07f2f
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/DataSet.Serialize.Import.pas b/src/DataSet.Serialize.Import.pas
@@ -220,6 +220,7 @@ procedure TJSONSerialize.JSONObjectToDataSet(const AJSONObject: TJSONObject; con
   {$ENDIF}
   LObjectState: string;
   LFormatSettings: TFormatSettings;
+  LKeyValues: TKeyValues;
   LTryStrToDateTime: TDateTime
 begin
   if (not Assigned(AJSONObject)) or (not Assigned(ADataSet)) or (AJSONObject.Count = 0) then
@@ -264,8 +265,12 @@ procedure TJSONSerialize.JSONObjectToDataSet(const AJSONObject: TJSONObject; con
           TFDDataSet(ADataSet).MasterSource := nil;
         end;
         {$ENDIF}
-        if not ADataSet.Locate(GetKeyFieldsDataSet(ADataSet), VarArrayOf(GetKeyValuesDataSet(ADataSet, AJSONObject)), []) then
-          Exit;
+        LKeyValues := GetKeyValuesDataSet(ADataSet, AJSONObject);
+        if (Length(LKeyValues) = 0) or (not ADataSet.Locate(GetKeyFieldsDataSet(ADataSet), VarArrayOf(LKeyValues), [])) then
+        begin
+          if ADataSet.State <> dsInsert then
+            ADataSet.Append;
+        end;
         if TUpdateStatus.usModified.ToString = LObjectState then
         begin
           if ADataSet.State <> dsEdit then