paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 20:09:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

fcl-db: sdfdataset: fix seting null value to Field, Buffer=nil

Browse Source 
git-svn-id: trunk@30532 -
This commit is contained in:
lacak 2015-04-10 07:04:53 +00:00
parent c8f610282d
commit b5bac61409
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/fcl-db/src/sdf/sdfdata.pp
View File

@ -631,10 +631,10 @@ begin
TempPos := RecBuf; TempPos := RecBuf;
SetFieldPos(TRecordBuffer(RecBuf), Field.FieldNo); SetFieldPos(TRecordBuffer(RecBuf), Field.FieldNo);
Result := (RecBuf < StrEnd(TempPos)); Result := (RecBuf < StrEnd(TempPos));
if Result and (Buffer <> nil) then if Result and Assigned(Buffer) then
begin begin
StrLCopy(Buffer, RecBuf, Field.Size); StrLCopy(Buffer, RecBuf, Field.Size);
if FTrimSpace then if FTrimSpace then // trim trailing spaces
begin begin
TempPos := StrEnd(Buffer); TempPos := StrEnd(Buffer);
repeat repeat
@ -674,7 +674,7 @@ begin
DatabaseErrorFmt(SReadOnlyField, [Field.DisplayName]); DatabaseErrorFmt(SReadOnlyField, [Field.DisplayName]);
if State in [dsEdit, dsInsert, dsNewValue] then if State in [dsEdit, dsInsert, dsNewValue] then
Field.Validate(Buffer); Field.Validate(Buffer);
if Field.FieldKind <> fkInternalCalc then if Assigned(Buffer) and (Field.FieldKind <> fkInternalCalc) then
begin begin
SetFieldPos(TRecordBuffer(RecBuf), Field.FieldNo); SetFieldPos(TRecordBuffer(RecBuf), Field.FieldNo);
BufEnd := StrEnd(pansichar(ActiveBuffer)); // Fill with blanks when necessary BufEnd := StrEnd(pansichar(ActiveBuffer)); // Fill with blanks when necessary