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

Update acr and fix some tiny covs

Browse Source
This commit is contained in:
pancake 2017-01-02 15:56:08 +01:00
parent 4748db1ed7
commit 8e59afb91c
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# This script was automatically generated by ACR v0.10.2 # This script was automatically generated by ACR v1.0
# @author: pancake <nopcode.org> # @author: pancake <nopcode.org>
# @url: http://www.nopcode.org # @url: http://www.nopcode.org
# @repo: git clone https://github.com/radare/acr # @repo: git clone https://github.com/radare/acr
@ -104,8 +104,8 @@ create_environ() {
: ${MANDIR:="${DATADIR}/man"} : ${MANDIR:="${DATADIR}/man"}
: ${LOCALSTATEDIR:="${SPREFIX}/var"} : ${LOCALSTATEDIR:="${SPREFIX}/var"}
for A in `echo ${PATH} | sed -e 's,:, ,g'` ; do for A in `echo ${PATH} | sed -e 's,:, ,g'` ; do
[ -e $A/ginstall ] && : ${INSTALL:=$A/ginstall} && break [ -e "$A"/ginstall ] && : ${INSTALL:="$A"/ginstall} && break
[ -e $A/install ] && : ${INSTALL:=$A/install} && break [ -e "$A"/install ] && : ${INSTALL:="$A"/install} && break
done done
: ${INSTALL_DIR:=${INSTALL} -d} : ${INSTALL_DIR:=${INSTALL} -d}
: ${INSTALL_DATA:=${INSTALL} -m 644} : ${INSTALL_DATA:=${INSTALL} -m 644}
@ -200,7 +200,7 @@ take_environ() {
} }
show_version() { show_version() {
echo "radare2-1.2.0-git configuration script done with acr v0.10.2. echo "radare2-1.2.0-git configuration script done with acr v1.0.
The 'Free Software Foundation' message is only for autodetection. The 'Free Software Foundation' message is only for autodetection.
Originally written by pancake <nopcode.org>." Originally written by pancake <nopcode.org>."
exit 0 exit 0

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

@ -1,4 +1,5 @@
/* radare - LGPL - Copyright 2011-2016 - pancake */ /* radare - LGPL - Copyright 2011-2016 - pancake */
#include <r_cons.h> #include <r_cons.h>
#include <r_types.h> #include <r_types.h>
#include <r_util.h> #include <r_util.h>
@ -17,7 +18,6 @@
#endif #endif
static bool dexdump = false; static bool dexdump = false;
static Sdb *mdb = NULL; static Sdb *mdb = NULL;
static Sdb *cdb = NULL; // TODO: remove if it is not used static Sdb *cdb = NULL; // TODO: remove if it is not used
@ -1132,7 +1132,6 @@ static const ut8 *parse_dex_class_method(RBinFile *binfile, RBinDexObj *bin,
} }
} }
} }
if (catchAll) { if (catchAll) {
p3 = r_uleb128 (p3, p3_end - p3, &v2); p3 = r_uleb128 (p3, p3_end - p3, &v2);
if (dexdump) { if (dexdump) {
@ -1144,7 +1143,6 @@ static const ut8 *parse_dex_class_method(RBinFile *binfile, RBinDexObj *bin,
} }
} }
} }
} else { } else {
if (dexdump) { if (dexdump) {
rbin->cb_printf ( rbin->cb_printf (
@ -1159,10 +1157,8 @@ static const ut8 *parse_dex_class_method(RBinFile *binfile, RBinDexObj *bin,
} }
} }
if (MC > 0 && debug_info_off > 0 && if (MC > 0 && debug_info_off > 0 && bin->header.data_offset < debug_info_off &&
bin->header.data_offset < debug_info_off && debug_info_off < bin->header.data_offset + bin->header.data_size) {
debug_info_off <
bin->header.data_offset + bin->header.data_size) {
dex_parse_debug_item (binfile, bin, c, MI, MA, ins_size, dex_parse_debug_item (binfile, bin, c, MI, MA, ins_size,
insns_size, cls->name, regsz, debug_info_off); insns_size, cls->name, regsz, debug_info_off);
} else if (MC > 0) { } else if (MC > 0) {

4
libr/core/disasm.c
View File

@ -2734,9 +2734,11 @@ static void ds_print_ptr(RDisasmState *ds, int len, int idx) {
} else { } else {
ds_print_as_string (ds); ds_print_as_string (ds);
} }
#if DEADCODE
if (aligned && ds->show_color) { if (aligned && ds->show_color) {
r_cons_printf (Color_RESET); r_cons_printf (Color_RESET);
} }
#endif
} }
// TODO: Use sdb in rbin to accelerate this // TODO: Use sdb in rbin to accelerate this
@ -3195,9 +3197,9 @@ callfallback:
} }
break; break;
} }
beach:
r_config_restore (hc); r_config_restore (hc);
r_config_hold_free (hc); r_config_hold_free (hc);
beach:
if (ds->show_spacy) { if (ds->show_spacy) {
switch (ds->analop.type) { switch (ds->analop.type) {
case R_ANAL_OP_TYPE_CALL: case R_ANAL_OP_TYPE_CALL: