diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/ppmviewer.c | 12 | ||||
-rw-r--r-- | apps/plugins/rockpaint.c | 14 |
2 files changed, 19 insertions, 7 deletions
diff --git a/apps/plugins/ppmviewer.c b/apps/plugins/ppmviewer.c index af66b58736..c947af10bd 100644 --- a/apps/plugins/ppmviewer.c +++ b/apps/plugins/ppmviewer.c | |||
@@ -294,11 +294,17 @@ enum plugin_status plugin_start(const void* parameter) | |||
294 | if(!parameter) return PLUGIN_ERROR; | 294 | if(!parameter) return PLUGIN_ERROR; |
295 | 295 | ||
296 | size_t buffer_size; | 296 | size_t buffer_size; |
297 | char *audiobuf = rb->plugin_get_audio_buffer(&buffer_size); | 297 | char *audiobuf = rb->plugin_get_buffer(&buffer_size); |
298 | if (buffer_size < PPM_MAXSIZE + LCD_WIDTH * LCD_HEIGHT + 1) | 298 | if (buffer_size < PPM_MAXSIZE + LCD_WIDTH * LCD_HEIGHT + 1) |
299 | { | 299 | { |
300 | rb->splash(HZ, "Not enough memory"); | 300 | /* steal from audiobuffer if plugin buffer is too small */ |
301 | return PLUGIN_ERROR; | 301 | audiobuf = rb->plugin_get_audio_buffer(&buffer_size); |
302 | |||
303 | if (buffer_size < PPM_MAXSIZE + LCD_WIDTH * LCD_HEIGHT + 1) | ||
304 | { | ||
305 | rb->splash(HZ, "Not enough memory"); | ||
306 | return PLUGIN_ERROR; | ||
307 | } | ||
302 | } | 308 | } |
303 | 309 | ||
304 | /* align on 16 bits */ | 310 | /* align on 16 bits */ |
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index d762737ce4..264e4f6b14 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c | |||
@@ -3031,12 +3031,18 @@ static int save_bitmap( char *file ) | |||
3031 | enum plugin_status plugin_start(const void* parameter) | 3031 | enum plugin_status plugin_start(const void* parameter) |
3032 | { | 3032 | { |
3033 | size_t buffer_size; | 3033 | size_t buffer_size; |
3034 | buffer = (buf*) | 3034 | buffer = (buf*) (((uintptr_t)rb->plugin_get_buffer(&buffer_size) + 3) & ~3); |
3035 | (((uintptr_t)rb->plugin_get_audio_buffer(&buffer_size) + 3) & ~3); | ||
3036 | if (buffer_size < sizeof(*buffer) + 3) | 3035 | if (buffer_size < sizeof(*buffer) + 3) |
3037 | { | 3036 | { |
3038 | rb->splash(HZ, "Not enough memory"); | 3037 | /* steal from audiobuffer if plugin buffer is too small */ |
3039 | return PLUGIN_ERROR; | 3038 | buffer = (buf*) |
3039 | (((uintptr_t)rb->plugin_get_audio_buffer(&buffer_size) + 3) & ~3); | ||
3040 | |||
3041 | if (buffer_size < sizeof(*buffer) + 3) | ||
3042 | { | ||
3043 | rb->splash(HZ, "Not enough memory"); | ||
3044 | return PLUGIN_ERROR; | ||
3045 | } | ||
3040 | } | 3046 | } |
3041 | 3047 | ||
3042 | rb->lcd_set_foreground(COLOR_WHITE); | 3048 | rb->lcd_set_foreground(COLOR_WHITE); |