Browse Source

* Correctly initialize some variables to avoid AV

Michaël Van Canneyt 1 year ago
parent
commit
b6b3cc88f8

+ 2 - 2
packages/fcl-web/src/restbridge/sqldbrestdata.pp

@@ -169,7 +169,7 @@ end;
 
 function TSQLDBRestDBHandler.GetString(aString: TRestStringProperty): UTF8String;
 begin
-  DefaultGetString(FStrings, aString);
+  Result:=DefaultGetString(FStrings, aString);
 end;
 
 class function TSQLDBRestDBHandler.DefaultGetString(aConfig : TRestStringsConfig; aString: TRestStringProperty): UTF8String;
@@ -790,7 +790,7 @@ begin
     Q.UsePrimaryKeyAsKey:=False;
     FillParams(roGet,Q.Params,WhereFilterList);
     if Not SpecialResource then
-      IO.Resource.CheckParams(IO.RestContext,roPost,Q.Params);
+      IO.Resource.CheckParams(IO.RestContext,roGet,Q.Params);
     Result:=Q;
   except
     Q.Free;

+ 3 - 1
packages/fcl-web/src/restbridge/sqldbrestjson.pp

@@ -121,7 +121,9 @@ Var
   D : TJSONData;
 
 begin
-  D:=(FJSON as TJSONObject).Find(aName);
+  D:=Nil;
+  if Assigned(FJSON) then
+    D:=(FJSON as TJSONObject).Find(aName);
   if D<>nil then
     Result:=D.Clone
   else