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

fcl-db: fix memory corruption in bufdataset. Issue #36747

Browse Source 
git-svn-id: trunk@44280 -
This commit is contained in:
ondrej 2020-03-07 13:57:26 +00:00
parent a880367b37
commit c49dbb9d9c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/fcl-db/src/base/bufdataset.pas
View File

@ -2607,7 +2607,10 @@ begin
if assigned(Buffer) then if assigned(Buffer) then
begin begin
inc(CurrBuff,FFieldBufPositions[Field.FieldNo-1]); inc(CurrBuff,FFieldBufPositions[Field.FieldNo-1]);
Move(CurrBuff^, Buffer^, GetFieldSize(FieldDefs[Field.FieldNo-1])); if Field.IsBlob then // we need GetFieldSize for BLOB but Field.DataSize for others - #36747
Move(CurrBuff^, Buffer^, GetFieldSize(FieldDefs[Field.FieldNo-1]))
else
Move(CurrBuff^, Buffer^, Field.DataSize);
end; end;
Result := True; Result := True;
end end
@ -2649,7 +2652,10 @@ begin
inc(CurrBuff,FFieldBufPositions[Field.FieldNo-1]); inc(CurrBuff,FFieldBufPositions[Field.FieldNo-1]);
if assigned(buffer) then if assigned(buffer) then
begin begin
Move(Buffer^, CurrBuff^, GetFieldSize(FieldDefs[Field.FieldNo-1])); if Field.IsBlob then // we need GetFieldSize for BLOB but Field.DataSize for others - #36747
Move(Buffer^, CurrBuff^, GetFieldSize(FieldDefs[Field.FieldNo-1]))
else
Move(Buffer^, CurrBuff^, Field.DataSize);
unSetFieldIsNull(NullMask,Field.FieldNo-1); unSetFieldIsNull(NullMask,Field.FieldNo-1);
end end
else else