readFileHeader() now returns 0 on error.

committer: mfx <mfx> 977394998 +0000
This commit is contained in:
Markus F.X.J. Oberhumer 2000-12-21 10:36:38 +00:00
parent 29ae1b7231
commit 2bb2124356

View File

@ -90,11 +90,11 @@ int PackVmlinuzI386::readFileHeader()
fi->readx(&h, sizeof(h));
if (h.boot_flag != 0xAA55)
return -1;
return 0;
setup_size = (1 + (h.setup_sects ? h.setup_sects : 4)) * 0x200;
if (setup_size <= 0 || setup_size >= file_size)
return -1;
return 0;
int format = UPX_F_VMLINUZ_i386;
unsigned sys_size = ALIGN_UP(file_size, 16) - setup_size;
@ -106,7 +106,7 @@ int PackVmlinuzI386::readFileHeader()
}
if (16 * h.sys_size != sys_size)
return -1;
return 0;
// FIXME: add more checks for a valid kernel