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

Fix some covs in DEX

Browse Source
This commit is contained in:
Marc 2017-04-11 11:28:12 +02:00 committed by radare
parent d8db741a9c
commit eeb3da8c8b
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libr/bin/format/dex/dex.c
View File

@ -95,7 +95,7 @@ RBinDexObj *r_bin_dex_new_buf(RBuffer *buf) {
}
dexhdr->class_size = classes_size / DEX_CLASS_SIZE;
bin->classes = (struct dex_class_t *) malloc (sizeof (struct dex_class_t) * dexhdr->class_size);
bin->classes = (struct dex_class_t *) calloc (dexhdr->class_size, sizeof (struct dex_class_t));
for (i = 0; i < dexhdr->class_size; i++) {
ut64 offset = dexhdr->class_offset + i * DEX_CLASS_SIZE;
if (offset + 32 > bin->size) {
@ -122,7 +122,7 @@ RBinDexObj *r_bin_dex_new_buf(RBuffer *buf) {
methods_size = 0;
}
dexhdr->method_size = methods_size / sizeof (struct dex_method_t);
bin->methods = (struct dex_method_t *) calloc (methods_size, 1);
bin->methods = (struct dex_method_t *) calloc (methods_size + 1, 1);
for (i = 0; i < dexhdr->method_size; i++) {
ut64 offset = dexhdr->method_offset + i * sizeof (struct dex_method_t);
if (offset + 8 > bin->size) {
@ -145,7 +145,7 @@ RBinDexObj *r_bin_dex_new_buf(RBuffer *buf) {
types_size = 0;
}
dexhdr->types_size = types_size / sizeof (struct dex_type_t);
bin->types = (struct dex_type_t *) calloc (types_size, 1);
bin->types = (struct dex_type_t *) calloc (types_size + 1, 1);
for (i = 0; i < dexhdr->types_size; i++) {
ut64 offset = dexhdr->types_offset + i * sizeof (struct dex_type_t);
if (offset + 4 > bin->size) {
@ -167,7 +167,7 @@ RBinDexObj *r_bin_dex_new_buf(RBuffer *buf) {
fields_size = 0;
}
dexhdr->fields_size = fields_size / sizeof (struct dex_field_t);
bin->fields = (struct dex_field_t *) calloc (fields_size, 1);
bin->fields = (struct dex_field_t *) calloc (fields_size + 1, 1);
for (i = 0; i < dexhdr->fields_size; i++) {
ut64 offset = dexhdr->fields_offset + i * sizeof (struct dex_field_t);
if (offset + 8 > bin->size) {
@ -188,7 +188,7 @@ RBinDexObj *r_bin_dex_new_buf(RBuffer *buf) {
if (dexhdr->prototypes_offset + protos_size >= bin->size) {
protos_size = bin->size - dexhdr->prototypes_offset;
}
if (protos_size < 0) {
if (protos_size < 1) {
dexhdr->prototypes_size = 0;
return bin;
}

5
libr/bin/p/bin_dex.c
View File

@ -328,7 +328,7 @@ static void dex_parse_debug_item(RBinFile *binfile, RBinDexObj *bin,
return;
}
RListIter *iter = r_list_iterator (params);
RListIter *iter;
char *name;
char *type;
int reg;
@ -1380,7 +1380,7 @@ static void parse_class(RBinFile *binfile, RBinDexObj *bin, RBinDexClass *c,
if (dexdump) {
rbin->cb_printf (" Virtual methods -\n");
}
p = parse_dex_class_method (
parse_dex_class_method (
binfile, bin, c, cls, p, p_end, sym_count,
c->class_data->virtual_methods_size, methods, false);
}
@ -1497,6 +1497,7 @@ static int dex_loadcode(RBinFile *arch, RBinDexObj *bin) {
}
len = strlen (class_name);
if (len < 1) {
free (class_name);
continue;
}
class_name = r_str_replace (class_name, ";", "", 0);