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

* fixed some buffer overflow errors in SetString (both short and

Browse Source 
ansistring versions) (merged)
This commit is contained in:
Jonas Maebe 2002-10-21 19:52:47 +00:00
parent b998bc26cb
commit f5a775bc7c
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rtl/inc/astrings.inc
View File

@ -805,11 +805,17 @@ begin
end; end;
Procedure SetString (Var S : AnsiString; Buf : PChar; Len : Longint); Procedure SetString (Var S : AnsiString; Buf : PChar; Len : Longint);
var
BufLen: longint;
begin begin
SetLength(S,Len); SetLength(S,Len);
If Buf<>Nil then If (Buf<>Nil) then
Move (Buf[0],S[1],Len); begin
BufLen := StrLen(Buf);
If (BufLen < Len) then
Len := BufLen;
Move (Buf[0],S[1],Len);
end;
end; end;
@ -835,7 +841,11 @@ end;
{ {
$Log$ $Log$
Revision 1.32 2002-10-20 12:59:21 jonas Revision 1.33 2002-10-21 19:52:47 jonas
* fixed some buffer overflow errors in SetString (both short and
ansistring versions) (merged)
Revision 1.32 2002/10/20 12:59:21 jonas
* fixed ansistring append helpers so they preserve the terminating #0 * fixed ansistring append helpers so they preserve the terminating #0
* optimized SetLength() so that it uses reallocmem in case the refcount * optimized SetLength() so that it uses reallocmem in case the refcount
of the target string is 1 of the target string is 1

19
rtl/inc/sstrings.inc
View File

@ -671,15 +671,28 @@ end;
Procedure SetString (Var S : Shortstring; Buf : PChar; Len : Longint); Procedure SetString (Var S : Shortstring; Buf : PChar; Len : Longint);
var
BufLen: Longint;
begin begin
S[0]:=chr(Len);
If Len > High(S) then
Len := High(S);
If Buf<>Nil then If Buf<>Nil then
Move (Buf[0],S[1],Len); begin
S[0]:=chr(len); BufLen := StrLen(Buf);
if BufLen < Len then
Len := BufLen;
Move (Buf[0],S[1],Len);
end;
end; end;
{ {
$Log$ $Log$
Revision 1.25 2002-10-19 17:06:50 michael Revision 1.26 2002-10-21 19:52:47 jonas
* fixed some buffer overflow errors in SetString (both short and
ansistring versions) (merged)
Revision 1.25 2002/10/19 17:06:50 michael
+ Added check for nil buffer to setstring + Added check for nil buffer to setstring
Revision 1.24 2002/10/02 18:21:51 peter Revision 1.24 2002/10/02 18:21:51 peter