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

* fixed buffer overflow bug in fpc_shortstr_append_shortstr in case

Browse Source 
the result was already 255 characters long
This commit is contained in:
Jonas Maebe 2003-12-09 20:08:30 +00:00
parent 89a84c4d9d
commit f66a3775c5
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rtl/powerpc/powerpc.inc
View File

@ -798,12 +798,14 @@ asm
lbz r10, 0(r5) lbz r10, 0(r5)
{ length 0? } { length 0? }
cmplwi r10,0 cmplwi r10,0
cmplw cr1,r6,r4
{ calculate min(length(s2),high(result)-length(result)) } { calculate min(length(s2),high(result)-length(result)) }
sub r9,r4,r6 sub r9,r4,r6
subc r8,r9,r10 { r8 := r9 - r10 } subc r8,r9,r10 { r8 := r9 - r10 }
subfe r9,r9,r9 { if r9 >= r10 then r9' := 0 else r9' := -1 } subfe r9,r9,r9 { if r9 >= r10 then r9' := 0 else r9' := -1 }
and r9,r8,r9 { if r9 >= r10 then r9' := 0 else r9' := r9-r10 } and r9,r8,r9 { if r9 >= r10 then r9' := 0 else r9' := r9-r10 }
cror 4*7+2,4*0+2,4*1+2
add r9,r9,r10 { if r9 >= r10 then r9' := r10 else r9' := r9 } add r9,r9,r10 { if r9 >= r10 then r9' := r10 else r9' := r9 }
{ calculate new length } { calculate new length }
@ -816,7 +818,7 @@ asm
add r3,r6,r3 add r3,r6,r3
{ if nothing to do, exit } { if nothing to do, exit }
beq .LShortStrAppendDone beq cr7, .LShortStrAppendDone
{ and concatenate } { and concatenate }
.LShortStrAppendLoop: .LShortStrAppendLoop:
lbzu r10,1(r5) lbzu r10,1(r5)
@ -1004,7 +1006,11 @@ end;
{ {
$Log$ $Log$
Revision 1.58 2003-12-07 14:27:45 jonas Revision 1.59 2003-12-09 20:08:30 jonas
* fixed buffer overflow bug in fpc_shortstr_append_shortstr in case
the result was already 255 characters long
Revision 1.58 2003/12/07 14:27:45 jonas
* fixed buffer overrun error in fillchar * fixed buffer overrun error in fillchar
Revision 1.57 2003/12/07 13:29:02 jonas Revision 1.57 2003/12/07 13:29:02 jonas