diff options
| author | Kim Woelders <kim@woelders.dk> | 2016-04-06 02:35:43 +0200 |
|---|---|---|
| committer | Kim Woelders <kim@woelders.dk> | 2016-04-06 02:36:23 +0200 |
| commit | ce94edca1ccfbe314cb7cd9453433fad404ec7ef (patch) | |
| tree | 80b38565f8057e7e6ef72da984851968873d163e | |
| parent | 16de244bd03d2f75da6508feb1ad9cb4e668e9dc (diff) | |
| download | imlib2-ce94edca1ccfbe314cb7cd9453433fad404ec7ef.tar.gz | |
Fix off-by-one OOB read in __imlib_MergeUpdate().
Patch by Yuriy M. Kaminskiy.
https://bugs.debian.org/819818
| -rw-r--r-- | src/lib/updates.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/updates.c b/src/lib/updates.c index 8167284..2f55fe7 100644 --- a/src/lib/updates.c +++ b/src/lib/updates.c @@ -112,7 +112,7 @@ __imlib_MergeUpdate(ImlibUpdate * u, int w, int h, int hgapmax) int xx, yy, ww, hh, ok, xww; for (xx = x + 1, ww = 1; - (T(xx, y).used & T_USED) && (xx < tw); xx++, ww++); + (xx < tw) && (T(xx, y).used & T_USED); xx++, ww++); xww = x + ww; for (yy = y + 1, hh = 1, ok = 1; (yy < th) && (ok); yy++, hh++) |