From ca2f831ead327d98ab3374acb3b07ad7632ea02d Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 23 Jul 2018 14:21:07 +0200 Subject: hexedit: fixes for redraw and down movement causing SEGV on attempt to access "Go to:" command was not updating row position, making next "down" movements for one screenful print empty lines instead of showing the contents. If the file is whole pages long, "down" movement at EOF was advancing position +16 bytes, mapping the next portion (entirely past the end of the file), then finding out that the new position is beyond the EOF, rolling it back -16 bytes... ending up with this postion pointing *before* the mapped portion. Any next access (e.g. "move right" key) SEGVs. function old new delta hexedit_main 1170 1184 +14 Signed-off-by: Denys Vlasenko --- miscutils/hexedit.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'miscutils/hexedit.c') diff --git a/miscutils/hexedit.c b/miscutils/hexedit.c index 95c930d12..298eb8149 100644 --- a/miscutils/hexedit.c +++ b/miscutils/hexedit.c @@ -153,7 +153,8 @@ static void redraw(unsigned cursor) i++; } - printf(ESC"[%u;%uH", 1 + cursor / 16, 1 + pos + (cursor & 0xf) * 3); + G.row = cursor / 16; + printf(ESC"[%u;%uH", 1 + G.row, 1 + pos + (cursor & 0xf) * 3); } static void redraw_cur_line(void) @@ -367,6 +368,8 @@ int hexedit_main(int argc UNUSED_PARAM, char **argv) if (G.current_byte > G.eof_byte) { /* _after_ eof - don't allow this */ G.current_byte -= 16; + if (G.current_byte < G.baseaddr) + move_mapping_lower(); break; } } -- cgit v1.2.3