From: Karel Zak Date: Mon, 18 Sep 2017 08:41:20 +0000 (+0200) Subject: libsmartcols: fix scols_line_move_cells() n+1 error [asan] X-Git-Tag: v2.31-rc1~69 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7928a926a05855c3f13f3d1c115f5a3a093d57ec;p=thirdparty%2Futil-linux.git libsmartcols: fix scols_line_move_cells() n+1 error [asan] Reported-by: Sami Kerola Signed-off-by: Karel Zak --- diff --git a/libsmartcols/src/line.c b/libsmartcols/src/line.c index c2a991c2d4..6c64e7f620 100644 --- a/libsmartcols/src/line.c +++ b/libsmartcols/src/line.c @@ -163,12 +163,12 @@ int scols_line_move_cells(struct libscols_line *ln, size_t newn, size_t oldn) /* remove old possition (move data behind oldn to oldn) */ if (oldn + 1 < ln->ncells) memmove(ln->cells + oldn, ln->cells + oldn + 1, - (ln->ncells - oldn) * sizeof(struct libscols_cell)); + (ln->ncells - oldn - 1) * sizeof(struct libscols_cell)); /* create a space for new position */ if (newn + 1 < ln->ncells) memmove(ln->cells + newn + 1, ln->cells + newn, - (ln->ncells - newn) * sizeof(struct libscols_cell)); + (ln->ncells - newn - 1) * sizeof(struct libscols_cell)); /* copy original data to new position */ memcpy(&ln->cells[newn], &ce, sizeof(struct libscols_cell));