3 files changed, 16 insertions, 8 deletions

diff --git a/apps/plugins/imageviewer/image_decoder.c b/apps/plugins/imageviewer/image_decoder.c
index eab1c01dbc..0c1776daaa 100644
--- a/apps/plugins/imageviewer/image_decoder.c
+++ b/apps/plugins/imageviewer/image_decoder.c
@@ -155,7 +155,10 @@ const struct image_decoder *load_decoder(struct loader_info *loader_info)
         goto error_close;
     }
 
-    if (lc_hdr->api_version != IMGDEC_API_VERSION)
+    if (lc_hdr->api_version != IMGDEC_API_VERSION ||
+        hdr->img_api_size > sizeof(struct imgdec_api) ||
+        hdr->plugin_api_version != PLUGIN_API_VERSION ||
+        hdr->plugin_api_size > sizeof(struct plugin_api))
     {
         rb->splashf(2*HZ, "%s decoder: Incompatible version.", name);
         goto error_close;
diff --git a/apps/plugins/imageviewer/imageviewer.h b/apps/plugins/imageviewer/imageviewer.h
index 19b5db15bb..ac15df5960 100644
--- a/apps/plugins/imageviewer/imageviewer.h
+++ b/apps/plugins/imageviewer/imageviewer.h
@@ -136,14 +136,17 @@ struct image_decoder {
                             int x, int y, int width, int height);
 };
 
-#define IMGDEC_API_VERSION  (PLUGIN_API_VERSION << 4 | 0)
+#define IMGDEC_API_VERSION 1
 
 /* image decoder header */
 struct imgdec_header {
     struct lc_header lc_hdr; /* must be the first */
     const struct image_decoder *decoder;
     const struct plugin_api **api;
+    unsigned short plugin_api_version;
+    size_t plugin_api_size;
     const struct imgdec_api **img_api;
+    size_t img_api_size;
 };
 
 #ifdef IMGDEC
@@ -157,15 +160,18 @@ extern const struct image_decoder image_decoder;
         const struct imgdec_header __header \
         __attribute__ ((section (".header")))= { \
         { PLUGIN_MAGIC, TARGET_ID, IMGDEC_API_VERSION, \
-        plugin_start_addr, plugin_end_addr }, &image_decoder, &rb, &iv };
+          plugin_start_addr, plugin_end_addr, }, &image_decoder, \
+          &rb, PLUGIN_API_VERSION, sizeof(struct plugin_api), \
+          &iv, sizeof(struct imgdec_api) };
 #else /* PLATFORM_HOSTED */
 #define IMGDEC_HEADER \
         const struct plugin_api *rb DATA_ATTR; \
         const struct imgdec_api *iv DATA_ATTR; \
         const struct imgdec_header __header \
         __attribute__((visibility("default"))) = { \
-        { PLUGIN_MAGIC, TARGET_ID, IMGDEC_API_VERSION, \
-        NULL, NULL }, &image_decoder, &rb, &iv };
+        { PLUGIN_MAGIC, TARGET_ID, IMGDEC_API_VERSION, NULL, NULL }, \
+          &image_decoder, &rb, PLUGIN_API_VERSION, sizeof(struct plugin_api), \
+          &iv, sizeof(struct imgdec_api), };
 #endif /* CONFIG_PLATFORM */
 #endif
 
diff --git a/apps/plugins/lib/overlay.c b/apps/plugins/lib/overlay.c
index 0ecc1bf3e7..065273534e 100644
--- a/apps/plugins/lib/overlay.c
+++ b/apps/plugins/lib/overlay.c
@@ -83,9 +83,8 @@ enum plugin_status run_overlay(const void* parameter,
         goto error_close;
     }
 
-    
-    if (hdr->api_version > PLUGIN_API_VERSION
-        || hdr->api_version < PLUGIN_MIN_API_VERSION)
+    if (hdr->api_version != PLUGIN_API_VERSION ||
+        p_hdr->api_size > sizeof(struct plugin_api))
     {
         rb->splashf(2*HZ, "%s overlay: Incompatible version.", name);
         goto error_close;