diff options
| author | Ron Yorston | 2018-12-03 10:07:58 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2018-12-03 10:07:58 +0100 |
| commit | d08206dce1291f512d7de9037d9ef1ffbf705cac (patch) | |
| tree | 373e132573908561f985206eb143a7cebb689f99 | |
| parent | b7330460693f12585c7a6246f0dfafd8742af05a (diff) | |
| download | busybox-d08206dce1291f512d7de9037d9ef1ffbf705cac.zip busybox-d08206dce1291f512d7de9037d9ef1ffbf705cac.tar.gz | |
vi: correctly detect when a deletion empties the buffer
Michał Berger has reported two issues:
- Repeatedly deleting and undoing the deletion of the last line
results in characters being lost from the end of the line.
- Deleting the bottom line twice then attempting to undo each of
these deletions results in a segfault.
The problem seems to be an incorrect test for whether the text buffer
is empty.
Reported-by: Michał Berger <michallinuxstuff@gmail.com>
Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | editors/vi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/vi.c b/editors/vi.c index ee3c7fe..2715294 100644 --- a/editors/vi.c +++ b/editors/vi.c @@ -2364,7 +2364,7 @@ static void undo_push(char *src, unsigned int length, uint8_t u_type) // Add to // Allocate a new undo object if (u_type == UNDO_DEL || u_type == UNDO_DEL_CHAIN) { // For UNDO_DEL objects, save deleted text - if ((src + length) == end) + if ((text + length) == end) length--; // If this deletion empties text[], strip the newline. When the buffer becomes // zero-length, a newline is added back, which requires this to compensate. |