Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-26 17:15:38 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix some more crashes for the Java CLASS and XBE RBin parsers

Browse Source
This commit is contained in:
pancake 2014-11-05 02:09:00 +01:00
parent 67d92749fe
commit 7af9bf009a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libr/bin/p/bin_xbe.c
View File

@ -126,6 +126,10 @@ static RList* sections(RBinFile *arch) {
ret->free = free;
sect = calloc (obj->header->sections, sizeof (xbe_section));
if (!sect) {
free (ret);
return NULL;
}
r_buf_read_at (arch->buf, obj->header->sechdr_addr - obj->header->base,
(ut8 *)sect, sizeof (xbe_section)*obj->header->sections);

6
shlr/java/class.c
View File

@ -1588,7 +1588,9 @@ R_API RBinJavaInterfaceInfo* r_bin_java_read_next_interface_item(RBinJavaObj *bi
ut8 idx[2] = {0};
RBinJavaInterfaceInfo *interface_obj;
const ut8 * if_buf = buf + offset;
memcpy (idx, if_buf, 2);
if (offset+2>=len)
return NULL;
memcpy (&idx, if_buf, 2);
interface_obj = r_bin_java_interface_new (bin, if_buf, len-offset);
if (interface_obj) {
interface_obj->file_offset = offset;
@ -2094,6 +2096,8 @@ R_API ut64 r_bin_java_parse_fields (RBinJavaObj *bin, const ut64 offset, const u
r_list_free (bin->fields_list);
bin->fields_list = r_list_newf (r_bin_java_fmtype_free);
bin->fields_offset = offset;
if (offset+2>=len)
return UT64_MAX;
bin->fields_count = R_BIN_JAVA_USHORT (fm_buf, 0);
adv += 2;
IFDBG eprintf ("Fields count: %d 0x%"PFMT64x"\n", bin->fields_count, bin->fields_offset);