mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

Added two checks for buffer overflows as suggested by Giovanni Bajo.

Browse Source 
committer: mfx <mfx> 1110732210 +0000
This commit is contained in:
Markus F.X.J. Oberhumer 2005-03-13 16:43:30 +00:00
parent 41f44c4e78
commit 0866a1996b
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/p_w32pe.cpp
View File

@ -1697,6 +1697,8 @@ void PackW32Pe::pack(OutputFile *fo)
jc = isection[ic].vsize;
if (isection[ic].vsize == 0) // hack for some tricky programs - may this break other progs?
jc = isection[ic].vsize = isection[ic].size;
if (isection[ic].vaddr + jc > ibuf.getSize())
throwInternalError("buffer too small 1");
fi->readx(ibuf + isection[ic].vaddr,jc);
jc += isection[ic].rawdataptr;
}
@ -1748,6 +1750,8 @@ void PackW32Pe::pack(OutputFile *fo)
unsigned newvsize = (isection[objs-1].vaddr + isection[objs-1].vsize + oam1) &~ oam1;
//fprintf(stderr,"newvsize=%x objs=%d\n",newvsize,objs);
if (newvsize + soimport + sorelocs > ibuf.getSize())
throwInternalError("buffer too small 2");
memcpy(ibuf+newvsize,oimport,soimport);
memcpy(ibuf+newvsize+soimport,orelocs,sorelocs);