ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libsmartcols: fix heap-buffer-overflow when move columns 

Reported-by: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2017-09-15 13:43:54 +02:00
parent ae1c9d6008
commit 1ed968c526
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libsmartcols/src/line.c
View File

@ -160,13 +160,15 @@ int scols_line_move_cells(struct libscols_line *ln, size_t newn, size_t oldn)
/* remember data from old position */
memcpy(&ce, &ln->cells[oldn], sizeof(struct libscols_cell));
/* remove from old position */
memmove(ln->cells + oldn, ln->cells + oldn + 1,
/* 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));
/* create a space for new position */
memmove(ln->cells + newn + 1, ln->cells + newn,
(ln->ncells - newn) * sizeof(struct libscols_cell));
if (newn + 1 < ln->ncells)
memmove(ln->cells + newn + 1, ln->cells + newn,
(ln->ncells - newn) * sizeof(struct libscols_cell));
/* copy original data to new position */
memcpy(&ln->cells[newn], &ce, sizeof(struct libscols_cell));