[git commit] vi: fix adjustment of buffer on partial file read

Denys Vlasenko vda.linux at googlemail.com
Fri Mar 15 01:10:07 UTC 2013


commit: http://git.busybox.net/busybox/commit/?id=cb5aa725df472a7ab84c7c513a8dda98b9b3a6bc
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

The second argument to text_hole_delete was incorrect: it should
be a pointer to the end of the hole.

Signed-off-by: Ron Yorston <rmy at tigress.co.uk>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 editors/vi.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/editors/vi.c b/editors/vi.c
index 7173415..3d6182b 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -2530,7 +2530,7 @@ static int file_insert(const char *fn, char *p, int update_ro_status)
 		p = text_hole_delete(p, p + size - 1);	// un-do buffer insert
 	} else if (cnt < size) {
 		// There was a partial read, shrink unused space text[]
-		p = text_hole_delete(p + cnt, p + (size - cnt) - 1);	// un-do buffer insert
+		p = text_hole_delete(p + cnt, p + size - 1);	// un-do buffer insert
 		status_line_bold("can't read '%s'", fn);
 	}
 	if (cnt >= size)


More information about the busybox-cvs mailing list