Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-27 15:10:53 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix crash in Java class parser (thanks Joxean)

Browse Source
This commit is contained in:
pancake 2014-10-09 13:56:27 +02:00
parent 745f4018e8
commit 8a3b127fb4
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shlr/java/Makefile
View File

@ -11,7 +11,7 @@ endif
ifeq (,$(findstring cygwin,${OSTYPE}))
ifeq (,$(findstring mingw32,${OSTYPE}))
CFLAGS+=-fPIC
CFLAGS+=-fPIC -g
else
CFLAGS+=-DMINGW32=1
endif

12
shlr/java/class.c
View File

@ -3181,9 +3181,8 @@ R_API RBinJavaAttrInfo* r_bin_java_code_attr_new (ut8 *buffer, ut64 sz, ut64 buf
ut32 k = 0, cur_location;
ut64 offset = 0;
attr = r_bin_java_default_attr_new (buffer, sz, buf_offset);
if (!attr) return NULL;
offset += 6;
if(attr == NULL)
return attr;
attr->type = R_BIN_JAVA_ATTR_TYPE_CODE_ATTR;
attr->info.code_attr.max_stack = R_BIN_JAVA_USHORT (buffer, offset);
offset += 2;
@ -3194,21 +3193,24 @@ R_API RBinJavaAttrInfo* r_bin_java_code_attr_new (ut8 *buffer, ut64 sz, ut64 buf
attr->info.code_attr.code_offset = buf_offset+offset;
attr->info.code_attr.code = (ut8* ) malloc (attr->info.code_attr.code_length);
if (attr->info.code_attr.code == NULL) {
eprintf ("Handling Code Attributes: Unable to allocate memory (%u bytes )for a code.\n", attr->info.code_attr.code_length);
eprintf ("Handling Code Attributes: Unable to allocate memory "
"(%u bytes) for a code.\n", attr->info.code_attr.code_length);
return attr;
}
R_BIN_JAVA_GLOBAL_BIN->current_code_attr = attr;
memset (attr->info.code_attr.code, 0, attr->info.code_attr.code_length);
memcpy (attr->info.code_attr.code, buffer+offset, attr->info.code_attr.code_length);
offset += attr->info.code_attr.code_length;
attr->info.code_attr.exception_table_length = R_BIN_JAVA_USHORT (buffer, offset);
attr->info.code_attr.exception_table_length = R_BIN_JAVA_USHORT (buffer, offset);
offset += 2;
attr->info.code_attr.exception_table = r_list_newf (free);
for (k = 0; k < attr->info.code_attr.exception_table_length; k++) {
cur_location = buf_offset+offset;
exc_entry = R_NEW0(RBinJavaExceptionEntry);
exc_entry->file_offset = cur_location;
exc_entry->start_pc = R_BIN_JAVA_USHORT (buffer,offset);
if (cur_location>sz)
return attr;
exc_entry->start_pc = R_BIN_JAVA_USHORT (buffer, offset);
offset += 2;
exc_entry->end_pc = R_BIN_JAVA_USHORT (buffer,offset);
offset += 2;