diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2006-01-18 08:34:32 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2006-01-18 08:34:32 +0000 |
| commit | a8c408c6a3049dc49e27f39008dff0001bf581bc (patch) | |
| tree | 44762072cecd0143b2b47a5ee1d35db85a3c543a /apps/plugin.c | |
| parent | 22ffc9bf0337876157ce2f6ed2594dc81f979dba (diff) | |
| download | rockbox-a8c408c6a3049dc49e27f39008dff0001bf581bc.zip rockbox-a8c408c6a3049dc49e27f39008dff0001bf581bc.tar.gz rockbox-a8c408c6a3049dc49e27f39008dff0001bf581bc.tar.bz2 rockbox-a8c408c6a3049dc49e27f39008dff0001bf581bc.tar.xz | |
More consistent error checking.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8364 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugin.c')
| -rw-r--r-- | apps/plugin.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/plugin.c b/apps/plugin.c index a6b9703..44eb0dc 100644 --- a/apps/plugin.c +++ b/apps/plugin.c @@ -399,8 +399,7 @@ int plugin_load(const char* plugin, void* parameter) } if (hdr == NULL || hdr->magic != PLUGIN_MAGIC - || hdr->target_id != TARGET_ID - || hdr->entry_point == NULL) { + || hdr->target_id != TARGET_ID) { sim_plugin_close(fd); gui_syncsplash(HZ*2, true, str(LANG_PLUGIN_WRONG_MODEL)); return -1; @@ -423,13 +422,14 @@ int plugin_load(const char* plugin, void* parameter) readsize = read(fd, pluginbuf, PLUGIN_BUFFER_SIZE); close(fd); - if (readsize <= (signed)sizeof(struct plugin_header)) { + if (readsize < 0) { gui_syncsplash(HZ*2, true, str(LANG_READ_FAILED), plugin); return -1; } hdr = (struct plugin_header *)pluginbuf; - if (hdr->magic != PLUGIN_MAGIC + if ((unsigned)readsize <= sizeof(struct plugin_header) + || hdr->magic != PLUGIN_MAGIC || hdr->target_id != TARGET_ID || hdr->load_addr != pluginbuf || hdr->end_addr > pluginbuf + PLUGIN_BUFFER_SIZE) { |