Skip to content

Fix rtr_http.inc.c Block Handling #25269

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

Open
dnakov wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix rtr_http.inc.c Block Handling #25269

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 6 additions & 21 deletions libr/core/rtr_http.inc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,20 +197,10 @@ static int r_core_rtr_http_run(RCore *core, int launch, int browse, const char *
/* Register this HTTP session so r2agent -L can discover it */
r_core_session_register (core, "r2web", atoi (port));

ut64 newoff, origoff = core->addr;
int newblksz, origblksz = core->blocksize;
ut8 *newblk, *origblk = core->block;

newblk = malloc (core->blocksize);
if (!newblk) {
r_socket_free (s);
r_list_free (so.authtokens);
free (pfile);
return 1;
}
memcpy (newblk, core->block, core->blocksize);

core->block = newblk;
ut64 origoff = core->addr;
ut64 newoff = origoff;
ut32 origblksz = core->blocksize;
ut32 newblksz = origblksz;
// TODO: handle mutex lock/unlock here
r_cons_break_push (core->cons, (RConsBreak)r_core_rtr_http_stop, core);
while (!r_cons_is_breaked (core->cons) && core->http_up) {
Expand All @@ -223,12 +213,9 @@ static int r_core_rtr_http_run(RCore *core, int launch, int browse, const char *
#endif

newoff = core->addr;
newblk = core->block;
newblksz = core->blocksize;

core->addr = origoff;
core->block = origblk;
core->blocksize = origblksz;
r_core_seek (core, origoff, true);

// backup and restore offset and blocksize
/* this is blocking */
Expand Down Expand Up @@ -273,11 +260,9 @@ static int r_core_rtr_http_run(RCore *core, int launch, int browse, const char *
}

origoff = core->addr;
origblk = core->block;
origblksz = core->blocksize;
core->addr = newoff;
core->block = newblk;
core->blocksize = newblksz;
r_core_seek (core, newoff, true);
/* set environment */
// backup and restore offset and blocksize
core->http_up = true;
Expand Down
Loading