Pārlūkot izejas kodu

fcld-db: dbase:
* Harden Visual FoxPro code: detect nil varbinary field source

git-svn-id: trunk@26972 -

reiniero 11 gadi atpakaļ
vecāks
revīzija
3478ca4672
1 mainītis faili ar 8 papildinājumiem un 3 dzēšanām
  1. 8 3
      packages/fcl-db/src/dbase/dbf_dbffile.pas

+ 8 - 3
packages/fcl-db/src/dbase/dbf_dbffile.pas

@@ -2139,9 +2139,14 @@ begin
     'Q': //Visual FoxPro varbinary
       begin
         // copy data, and update varlength flag/varlength byte in field data
-        Len := PWord(Src)^;
-        if Len > FieldSize then
-          Len := FieldSize;
+        if Src = nil then
+          Len := 0
+        else
+        begin
+          Len := PWord(Src)^;
+          if Len > FieldSize then
+            Len := FieldSize;
+        end;
         if Len < FieldSize then
         begin
           // Clear flag and store actual size byte in last data byte