Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-10-09 03:43:28 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Set io.va to false if binobj says so

Browse Source
This commit is contained in:
alvarofe 2017-08-28 21:22:23 +02:00
parent 731ff16101
commit 233574cf8e
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libr/core/file.c
View File

@ -625,6 +625,9 @@ R_API bool r_core_bin_load(RCore *r, const char *filenameuri, ut64 baddr) {
}
}
obj = r_bin_cur_object (r->bin);
if (!obj->info->has_va) {
r_config_set_i (r->config, "io.va", 0);
}
//workaround to map correctly malloc:// and raw binaries
if (!plugin || !strcmp (plugin->name, "any") || r_io_desc_is_dbg (desc) || (obj && !obj->sections)) {
r_io_map_new (r->io, desc->fd, desc->flags, 0LL, laddr, r_io_desc_size (desc), true);

21
libr/search/search.c
View File

@ -90,13 +90,6 @@ R_API int r_search_begin(RSearch *s) {
kw->distance = 0; //s->distance;
kw->last = 0;
}
#if 0
/* TODO: compile regexpes */
switch(s->mode) {
case R_SEARCH_REGEXP:
break;
}
#endif
return true;
}
@ -378,7 +371,9 @@ R_API void r_search_set_distance(RSearch *s, int dist) {
if (dist>=R_SEARCH_DISTANCE_MAX) {
eprintf ("Invalid distance\n");
s->distance = 0;
} else s->distance = (dist>0)?dist:0;
} else {
s->distance = (dist>0)?dist:0;
}
}
// deprecate? or standarize with ->align ??
@ -443,10 +438,12 @@ R_API void r_search_kw_reset(RSearch *s) {
R_API void r_search_reset(RSearch *s, int mode) {
r_list_purge (s->hits);
s->nhits = 0;
s->hits = r_list_new ();
if (!s->hits) return;
s->hits->free = free;
s->hits = r_list_newf ((RListFree)free);
if (!s->hits) {
return;
}
r_search_kw_reset (s);
if (!r_search_set_mode (s, mode))
if (!r_search_set_mode (s, mode)) {
eprintf ("Cannot init search for mode %d\n", mode);
}
}