jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
John Reiser
2006-12-19 16:16:20 -08:00
parent 745de1abab 2487595778
commit 73090b98ab
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/p_vmlinx.cpp
+5 -5
View File
@@ -482,7 +482,7 @@ void PackVmlinuxBase<T>::unpack(OutputFile *fo)
fi->seek(p_note0->sh_offset, SEEK_SET); fi->seek(p_note0->sh_offset, SEEK_SET);
fi->readx(&word, sizeof(word)); fi->readx(&word, sizeof(word));
ph.u_len = BeLePolicy::get32(&word); ph.u_len = word;
ph.c_len = p_note0->sh_size - sizeof(word); ph.c_len = p_note0->sh_size - sizeof(word);
ibuf.alloc(ph.c_len); ibuf.alloc(ph.c_len);
fi->readx(ibuf, ph.c_len); fi->readx(ibuf, ph.c_len);
@@ -511,7 +511,7 @@ void PackVmlinuxBase<T>::unpack(OutputFile *fo)
fi->seek(p_note1->sh_offset, SEEK_SET); fi->seek(p_note1->sh_offset, SEEK_SET);
fi->readx(&word, sizeof(word)); fi->readx(&word, sizeof(word));
ph.u_len = BeLePolicy::get32(&word); ph.u_len = word;
ph.c_len = p_note1->sh_size - sizeof(word); ph.c_len = p_note1->sh_size - sizeof(word);
ibuf.alloc(ph.c_len); ibuf.alloc(ph.c_len);
fi->readx(ibuf, p_note1->sh_size - sizeof(ph.u_len)); fi->readx(ibuf, p_note1->sh_size - sizeof(ph.u_len));
@@ -713,9 +713,9 @@ bool PackVmlinuxARM::has_valid_vmlinux_head()
U32 buf[2]; U32 buf[2];
fi->seek(p_text->sh_offset + sizeof(stub_arm_linux_kernel_vmlinux_head) -8, SEEK_SET); fi->seek(p_text->sh_offset + sizeof(stub_arm_linux_kernel_vmlinux_head) -8, SEEK_SET);
fi->readx(buf, sizeof(buf)); fi->readx(buf, sizeof(buf));
//unsigned const word0 = BeLePolicy::get32(&buf[0]); //unsigned const word0 = buf[0];
unsigned const word1 = BeLePolicy::get32(&buf[1]); unsigned const word1 = buf[1];
if (0xeb==(word1>>24) if (0xeb==(word1>>24
&& (0x00ffffff& word1)==(-1+ ((3+ ph.c_len)>>2))) { && (0x00ffffff& word1)==(-1+ ((3+ ph.c_len)>>2))) {
return true; return true;
} }