summaryrefslogtreecommitdiff
path: root/apps/gui/icon.c
diff options
context:
space:
mode:
authorWilliam Wilgus <me.theuser@yahoo.com>2019-09-24 23:40:38 -0500
committerWilliam Wilgus <me.theuser@yahoo.com>2019-09-24 23:51:12 -0500
commit5afdcdd46043481675a48891a071dbb1fea1ab4c (patch)
tree23346110e2b3889ce75b1e2ba654542607527807 /apps/gui/icon.c
parent60825970e93b6d9b4aec19456a1e7c142f904bd3 (diff)
downloadrockbox-5afdcdd46043481675a48891a071dbb1fea1ab4c.tar.gz
rockbox-5afdcdd46043481675a48891a071dbb1fea1ab4c.zip
Bug fix icon.c crashes with negative icon index
The index for Icon_NOICON is -1 which is caught properly as is icon > Icon_Last_Themeable But if you pass an index lower than Icon_NOICON screen_put_iconxy() tries to read memory prior to the iconset resulting in a crash Change-Id: I415e650932d65214d883a1595e22261f22e776b6
Diffstat (limited to 'apps/gui/icon.c')
-rw-r--r--apps/gui/icon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/gui/icon.c b/apps/gui/icon.c
index c20f1fe09a..db3ae2c96b 100644
--- a/apps/gui/icon.c
+++ b/apps/gui/icon.c
@@ -107,7 +107,7 @@ void screen_put_iconxy(struct screen * display,
107 const int is_rtl = lang_is_rtl(); 107 const int is_rtl = lang_is_rtl();
108 const struct bitmap *iconset; 108 const struct bitmap *iconset;
109 109
110 if (icon == Icon_NOICON) 110 if (icon <= Icon_NOICON)
111 { 111 {
112 if (is_rtl) 112 if (is_rtl)
113 xpos = display->getwidth() - xpos - width; 113 xpos = display->getwidth() - xpos - width;