Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-26 09:06:02 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix crash in V. when no maps loaded

Browse Source
This commit is contained in:
pancake 2021-04-30 00:35:51 +02:00
parent 073bb0e4f5
commit d9e7ae80ad
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/core/visual.c
View File

@ -3476,10 +3476,10 @@ R_API int r_core_visual_cmd(RCore *core, const char *arg) {
RIOMap *map = r_pvector_pop (&core->io->maps);
if (map) {
entry = r_io_map_begin (map);
r_pvector_push_front (&core->io->maps, map);
} else {
entry = r_config_get_i (core->config, "bin.baddr");
}
r_pvector_push_front (&core->io->maps, map);
}
}
if (entry != UT64_MAX) {

6
libr/util/vector.c
View File

@ -305,6 +305,9 @@ R_API void r_pvector_remove_data(RPVector *vec, void *x) {
R_API void *r_pvector_pop(RPVector *vec) {
r_return_val_if_fail (vec, NULL);
if (r_pvector_len (vec) < 1) {
return NULL;
}
void *r = r_pvector_at (vec, vec->v.len - 1);
r_vector_pop (&vec->v, NULL);
return r;
@ -312,6 +315,9 @@ R_API void *r_pvector_pop(RPVector *vec) {
R_API void *r_pvector_pop_front(RPVector *vec) {
r_return_val_if_fail (vec, NULL);
if (r_pvector_len (vec) < 1) {
return NULL;
}
void *r = r_pvector_at (vec, 0);
r_vector_pop_front (&vec->v, NULL);
return r;