diff options
| author | Bertrik Sikken <bertrik@sikken.nl> | 2012-06-10 17:15:47 +0200 |
|---|---|---|
| committer | Bertrik Sikken <bertrik@sikken.nl> | 2012-06-10 17:15:47 +0200 |
| commit | d023bf0f5dedb67caf9229e3ddcbb5a9fea420ce (patch) | |
| tree | 3562a23f7eb6009e161cbc8aae943de33d168b91 /apps/gui | |
| parent | 900cf6d52bd806bd54ad2118e245cd3465ea6815 (diff) | |
| download | rockbox-d023bf0f5dedb67caf9229e3ddcbb5a9fea420ce.zip rockbox-d023bf0f5dedb67caf9229e3ddcbb5a9fea420ce.tar.gz rockbox-d023bf0f5dedb67caf9229e3ddcbb5a9fea420ce.tar.bz2 rockbox-d023bf0f5dedb67caf9229e3ddcbb5a9fea420ce.tar.xz | |
Fix checks on buflib allocated handles (0 is not a valid handle value)
Change-Id: I8fdc5a59a5062f40a431cd49971390e21631b8ec
Diffstat (limited to 'apps/gui')
| -rw-r--r-- | apps/gui/icon.c | 2 | ||||
| -rw-r--r-- | apps/gui/skin_engine/skin_backdrops.c | 2 | ||||
| -rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/apps/gui/icon.c b/apps/gui/icon.c index 46da38b..f37cee9 100644 --- a/apps/gui/icon.c +++ b/apps/gui/icon.c @@ -197,7 +197,7 @@ static void load_icons(const char* filename, enum Iconset iconset, size_t buf_size = read_bmp_fd(fd, &ic->bmp, 0, bmpformat|FORMAT_RETURN_SIZE, NULL); ic->handle = core_alloc_ex(filename, buf_size, &buflib_ops); - if (ic->handle < 0) + if (ic->handle <= 0) { close(fd); return; diff --git a/apps/gui/skin_engine/skin_backdrops.c b/apps/gui/skin_engine/skin_backdrops.c index edb895c..0d3c8b6 100644 --- a/apps/gui/skin_engine/skin_backdrops.c +++ b/apps/gui/skin_engine/skin_backdrops.c @@ -245,7 +245,7 @@ void skin_backdrop_load_setting(void) backdrops[i].buflib_handle = core_alloc_ex(global_settings.backdrop_file, LCD_BACKDROP_BYTES, &buflib_ops); - if (backdrops[i].buflib_handle < 0) + if (backdrops[i].buflib_handle <= 0) return; } bool loaded; diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 4784039..4de0aae 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -1665,7 +1665,7 @@ static int load_skin_bmp(struct wps_data *wps_data, struct bitmap *bitmap, char* size_t buf_size = read_bmp_fd(fd, bitmap, 0, format|FORMAT_RETURN_SIZE, NULL); handle = core_alloc_ex(bitmap->data, buf_size, &buflib_ops); - if (handle < 0) + if (handle <= 0) { DEBUGF("Not enough skin buffer: need %zd more.\n", buf_size - skin_buffer_freespace()); @@ -2315,7 +2315,7 @@ bool skin_data_load(enum screen_type screen, struct wps_data *wps_data, #ifndef __PCTOOL__ wps_data->buflib_handle = core_alloc(isfile ? buf : "failsafe skin", skin_buffer_usage()); - if (wps_data->buflib_handle >= 0) + if (wps_data->buflib_handle > 0) { wps_data->wps_loaded = true; memcpy(core_get_data(wps_data->buflib_handle), skin_buffer, |