Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-02 18:27:18 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fix crash in core/file.c when loading empty files

Browse Source
This commit is contained in:
pancake 2014-06-05 23:07:02 +02:00
parent 11080c54c4
commit b564af7d09
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/r2theme.html
View File

@ -114,6 +114,7 @@ ec trap rgb:5da
ec swi rgb:2dd
ec cmp rgb:d7d
ec reg rgb:5dd
ec creg rgb:5dd
ec num rgb:7d7
ec mov rgb:f72
</textarea>

37
libr/core/file.c
View File

@ -396,16 +396,20 @@ R_API int r_core_bin_load(RCore *r, const char *filenameuri, ut64 baddr) {
int is_io_load = desc && desc->plugin;
if ( (filenameuri == NULL || !*filenameuri) && cf)
filenameuri = cf->filename;
else if (cf && strcmp (filenameuri, cf->filename) ) {
// XXX - this needs to be handled appropriately
// if the cf does not match the filenameuri then
// either that RCoreFIle * needs to be loaded or a
// new RCoreFile * should be opened.
if (!strcmp (suppress_warning, "false"))
eprintf ("Error: The filenameuri %s is not the same as the current RCoreFile: %s\n",
filenameuri, cf->filename);
if (cf) {
if ((filenameuri == NULL || !*filenameuri))
filenameuri = cf->filename;
else if (cf->filename && strcmp (filenameuri, cf->filename) ) {
// XXX - this needs to be handled appropriately
// if the cf does not match the filenameuri then
// either that RCoreFIle * needs to be loaded or a
// new RCoreFile * should be opened.
if (!strcmp (suppress_warning, "false"))
eprintf ("Error: The filenameuri %s is not the same as the current RCoreFile: %s\n",
filenameuri, cf->filename);
}
if (cf->map)
loadaddr = cf->map->from;
}
if (!filenameuri) {
@ -413,16 +417,13 @@ R_API int r_core_bin_load(RCore *r, const char *filenameuri, ut64 baddr) {
return R_FALSE;
}
if (cf && cf->map) {
loadaddr = cf->map->from;
}
r->bin->minstrlen = r_config_get_i (r->config, "bin.minstr");
if (is_io_load) {
//RIODesc *oldesc = desc;
// DEBUGGER
// TODO? necessary to restore the desc back?
// RIODesc *oldesc = desc;
// Fix to select pid before trying to load the binary
if ( (desc->plugin && desc->plugin->debug) || r_config_get_i (r->config, "cfg.debug")) {
if ( (desc->plugin && desc->plugin->debug) \
|| r_config_get_i (r->config, "cfg.debug")) {
r_core_file_do_load_for_debug (r, loadaddr, filenameuri);
} else {
r_core_file_do_load_for_io_plugin (r, baddr, loadaddr);
@ -435,7 +436,7 @@ R_API int r_core_bin_load(RCore *r, const char *filenameuri, ut64 baddr) {
binfile = r_bin_cur (r->bin);
r_core_bin_set_env (r, binfile);
plugin = r_bin_file_cur_plugin (binfile);
if ( plugin && strncmp (plugin->name, "any", 5)==0 ) {
if (plugin && plugin->name && !strncmp (plugin->name, "any", 5)) {
// set use of raw strings
r_config_set (r->config, "bin.rawstr", "true");
r_config_set_i (r->config, "io.va", 0);