dnrops
/
radare2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix regression after memleak fix

This commit is contained in:
pancake 2016-12-20 02:13:33 +01:00
parent 24f9981b65
commit 3cab378e00
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -114,12 +114,12 @@ done
: ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s}
: ${INSTALL_MAN:=${INSTALL} -m 444}
: ${INSTALL_LIB:=${INSTALL} -m 755 -c}
PKGNAME='radare2' ; VERSION='1.1.0-git' ; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake <pancake@nopcode.org>" ;
PKGNAME='radare2' ; VERSION='1.1.0' ; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake <pancake@nopcode.org>" ;
}
show_usage() {
cat <<EOF2
'configure' configures radare2-1.1.0-git to adapt to many kinds of systems.
'configure' configures radare2-1.1.0 to adapt to many kinds of systems.
Usage: ./configure [OPTION]... [VAR=VALUE]...
@ -200,7 +200,7 @@ take_environ() {
}
show_version() {
echo "radare2-1.1.0-git configuration script done with acr v0.10.5.
echo "radare2-1.1.0 configuration script done with acr v0.10.5.
The 'Free Software Foundation' message is only for autodetection.
Originally written by pancake <nopcode.org>."
exit 0
@ -224,7 +224,7 @@ case $flag in
show_version ; ;;
-r|--r|--report)
echo "PKGNAME: radare2"
echo "VERSION: 1.1.0-git"
echo "VERSION: 1.1.0"
echo "LANGS: c"
echo "REQUIRED: libdl"
echo "OPTIONAL: libmagic"

2
configure.acr
View File

@ -1,5 +1,5 @@
PKGNAME radare2
VERSION 1.1.0-git
VERSION 1.1.0
CONTACT pancake ; pancake@nopcode.org
LANG_C!

4
libr/core/disasm.c
View File

@ -3735,7 +3735,6 @@ toro:
buf = nbuf = malloc (len);
if (ds->tries > 0) {
if (r_core_read_at (core, ds->addr, buf, len)) {
R_FREE (nbuf);
goto toro;
}
}
@ -3744,11 +3743,9 @@ toro:
if (r_core_read_at (core, ds->addr, buf, len) != len) {
//ds->tries = -1;
}
R_FREE (nbuf);
goto toro;
}
if (continueoninvbreak) {
R_FREE (nbuf);
goto toro;
}
R_FREE (nbuf);
@ -3764,6 +3761,7 @@ toro:
ds_print_esil_anal_fini (ds);
ds_reflines_fini (ds);
ds_free (ds);
R_FREE (nbuf);
/* used by asm.emu */
r_reg_arena_pop (core->anal->reg);
return idx; //-ds->lastfail;

2
libr/core/visual.c
View File

@ -424,7 +424,7 @@ static void findPair (RCore *core) {
p = (const ut8*)strchr (keys, ch);
if (p) {
char p_1 = 0;
if ((char *)p != keys) {
if ((const char *)p != keys) {
p_1 = p[-1];
}
delta = (size_t)(p-(const ut8*)keys);

1
libr/util/str.c
View File

@ -1522,7 +1522,6 @@ R_API char *r_str_ansi_crop(const char *str, unsigned int x, unsigned int y,
cw = 0;
} else if (*str == 0x1b && str + 1 && *(str + 1) == '[') {
const char *ptr;
if ((r_end - r) > 3) {
/* copy 0x1b and [ */
*r++ = *str++;