Fix optimization that was invalidating all C* commands

This commit is contained in:
pancake 2013-04-05 12:37:28 +02:00
parent 99430303e4
commit efb02c8a95
3 changed files with 7 additions and 7 deletions

View File

@ -180,7 +180,7 @@ R_API int r_meta_add(RMeta *m, int type, ut64 from, ut64 to, const char *str) {
case R_META_TYPE_STRING:
case R_META_TYPE_FORMAT:
/* we should remove overlapped types and so on.. */
// r_meta_cleanup (m, from, to);
//r_meta_cleanup (m, from, to);
case R_META_TYPE_COMMENT:
if (type == R_META_TYPE_COMMENT)
if (r_meta_comment_check (m, str))

View File

@ -130,10 +130,10 @@ static RList* methods (RBinArch *arch) {
break;
if (idx >= bin->header.strings_size) // workaround
continue;
buf = r_buf_get_at (bin->b, bin->strings[idx], &left);
buf = (char*)r_buf_get_at (bin->b, bin->strings[idx], &left);
len = dex_read_uleb128 (buf);
if (len<1) continue;
name = r_buf_get_at (bin->b,
name = (char *) r_buf_get_at (bin->b,
bin->strings[bin->methods[i].name_id]+
dex_uleb128_len (buf), &left);
if (!name) {
@ -164,12 +164,12 @@ static RList* methods (RBinArch *arch) {
break;
if (idx >= bin->header.strings_size) // workaround
continue;
buf = r_buf_get_at (bin->b, bin->strings[idx], &left);
buf = (char*)r_buf_get_at (bin->b, bin->strings[idx], &left);
//r_buf_read_at (bin->b, bin->strings[idx], (ut8*)&buf, 6);
// TODO: use r_buf_get_at here
len = dex_read_uleb128 (buf);
name = r_buf_get_at (bin->b,
name = (char *)r_buf_get_at (bin->b,
bin->strings[bin->methods[i].name_id]+
dex_uleb128_len (buf), &left);
if (!name) {

View File

@ -62,7 +62,7 @@ static int bin_strings (RCore *r, int mode, ut64 baddr, int va) {
va? baddr+string->rva:string->offset,
string->size, 0);
}
r_meta_cleanup (r->anal->meta, 0LL, UT64_MAX);
//r_meta_cleanup (r->anal->meta, 0LL, UT64_MAX);
r_cons_break_end ();
} else {
r_cons_printf (mode?"fs strings\n": "[strings]\n");
@ -502,7 +502,7 @@ static int bin_symbols (RCore *r, int mode, ut64 baddr, int va, ut64 at, const c
free (dname);
}
free (name);
r_meta_cleanup (r->anal->meta, 0LL, UT64_MAX);
//r_meta_cleanup (r->anal->meta, 0LL, UT64_MAX);
}
} else {
if (!at) {