From a898d31f76b7424aeb65b07350cec3539620d50e Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Sun, 19 Jan 2020 18:43:51 +0100 Subject: [PATCH] acme: fix off by one in colclose(), make dellist() code consistent --- sys/src/cmd/acme/cols.c | 2 +- sys/src/cmd/acme/edit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/src/cmd/acme/cols.c b/sys/src/cmd/acme/cols.c index f66634d57..d069d64fe 100644 --- a/sys/src/cmd/acme/cols.c +++ b/sys/src/cmd/acme/cols.c @@ -131,8 +131,8 @@ colclose(Column *c, Window *w, int dofree) windelete(w); winclose(w); } - memmove(c->w+i, c->w+i+1, (c->nw-i)*sizeof(Window*)); c->nw--; + memmove(c->w+i, c->w+i+1, (c->nw-i)*sizeof(Window*)); c->w = realloc(c->w, c->nw*sizeof(Window*)); if(c->nw == 0){ draw(screen, r, display->white, nil, ZP); diff --git a/sys/src/cmd/acme/edit.c b/sys/src/cmd/acme/edit.c index 977b21a7a..fa022473d 100644 --- a/sys/src/cmd/acme/edit.c +++ b/sys/src/cmd/acme/edit.c @@ -267,8 +267,8 @@ growlist(List *l) void dellist(List *l, int i) { - memmove(&l->ptr[i], &l->ptr[i+1], (l->nused-(i+1))*sizeof(void*)); l->nused--; + memmove(&l->ptr[i], &l->ptr[i+1], (l->nused-i)*sizeof(void*)); } /*