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

fcl-db: sqlite: Always add null terminator to end of moved strings. (in case of length of data in db > FieldDef.Size null terminator is not moved).

Browse Source 
Bug #0023338.
Fixes also already existing failed test.

git-svn-id: trunk@23033 -
This commit is contained in:
lacak 2012-11-19 09:54:25 +00:00
parent a7e7d97da6
commit 66f458467f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp
View File

@ -628,6 +628,7 @@ begin
int1:=FieldDef.Size;
if int1 > 0 then
move(sqlite3_column_text(st,fnum)^,buffer^,int1);
PAnsiChar(buffer + int1)^ := #0;
end;
ftFmtBCD: begin
int1:= sqlite3_column_bytes(st,fnum);
@ -648,11 +649,12 @@ begin
ftFixedWideChar,
ftWideString:
begin
int1 := sqlite3_column_bytes16(st,fnum)+2; //The value returned does not include the zero terminator at the end of the string
if int1>(FieldDef.Size+1)*2 then
int1:=(FieldDef.Size+1)*2;
int1 := sqlite3_column_bytes16(st,fnum); //The value returned does not include the zero terminator at the end of the string
if int1>FieldDef.Size*2 then
int1:=FieldDef.Size*2;
if int1 > 0 then
move(sqlite3_column_text16(st,fnum)^, buffer^, int1); //Strings returned by sqlite3_column_text() and sqlite3_column_text16(), even empty strings, are always zero terminated.
PWideChar(buffer + int1)^ := #0;
end;
ftVarBytes,
ftBytes: