Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix segfault on oo+ #9

Open
wants to merge 2 commits into
base: opsiol
Choose a base branch
from
Open

fix segfault on oo+ #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75c12a9
fix segfault on oo+
condret Aug 11, 2017
e79e7d1
fix section-reapply
condret Aug 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions libr/io/section.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,18 +565,23 @@ R_API bool r_io_section_apply(RIO *io, ut32 id, RIOSectionApplyMethod method) {
static bool _section_reapply_anal_or_patch(RIO *io, RIOSection *sec, RIOSectionApplyMethod method) {
SdbListIter *iter;
RIOMap *map;
RIODesc* desc;
if (!sec) {
return false;
}
if (sec->memmap) {
ls_foreach (io->maps, iter, map) {
if (map->id == sec->memmap) {
r_io_close (io, map->fd);
desc = r_io_desc_get (io, map->fd);
if (desc && desc->plugin && desc->plugin->close) { //we can't use r_io_close here, bc it breaks the section-list
desc->plugin->close (desc);
r_io_desc_del (io, map->fd);
}
sec->memmap = 0;
r_io_map_cleanup (io);
break;
}
}
r_io_map_del (io, sec->memmap);
sec->memmap = 0;
}
r_io_map_del (io, sec->filemap);
sec->filemap = 0;
Expand Down Expand Up @@ -725,12 +730,12 @@ R_API bool r_io_section_reapply(RIO *io, ut32 id, RIOSectionApplyMethod method)

R_API bool r_io_section_reapply_bin(RIO *io, ut32 binid, RIOSectionApplyMethod method) {
RIOSection *sec;
SdbListIter *iter;
SdbListIter *iter, *ator;
bool ret = false;
if (!io || !io->sections) {
return false;
}
ls_foreach (io->sections, iter, sec) {
ls_foreach_safe (io->sections, iter, ator, sec) {
if (sec && (sec->bin_id == binid)) {
ret = true;
_section_reapply (io, sec, method);
Expand Down