Cleanup: pass header size to 'is_a' callbacks

No functional changes, prepare for fixing out-of-bounds access
when reading headers.

1 files changed, 11 insertions, 11 deletions

diff --git a/source/blender/imbuf/intern/IMB_filetype.h b/source/blender/imbuf/intern/IMB_filetype.h
index 520e810fe32..7bdbbb03227 100644
--- a/source/blender/imbuf/intern/IMB_filetype.h
+++ b/source/blender/imbuf/intern/IMB_filetype.h
@@ -32,7 +32,7 @@ typedef struct ImFileType {
   void (*init)(void);
   void (*exit)(void);
 
-  int (*is_a)(const unsigned char *buf);
+  bool (*is_a)(const unsigned char *buf, const size_t size);
   int (*ftype)(const struct ImFileType *type, const struct ImBuf *ibuf);
   struct ImBuf *(*load)(const unsigned char *mem,
                         size_t size,
@@ -67,7 +67,7 @@ void imb_tile_cache_tile_free(struct ImBuf *ibuf, int tx, int ty);
 /* Type Specific Functions */
 
 /* png */
-int imb_is_a_png(const unsigned char *mem);
+bool imb_is_a_png(const unsigned char *mem, const size_t size);
 struct ImBuf *imb_loadpng(const unsigned char *mem,
                           size_t size,
                           int flags,
@@ -75,7 +75,7 @@ struct ImBuf *imb_loadpng(const unsigned char *mem,
 bool imb_savepng(struct ImBuf *ibuf, const char *filepath, int flags);
 
 /* targa */
-int imb_is_a_targa(const unsigned char *buf);
+bool imb_is_a_targa(const unsigned char *buf, const size_t size);
 struct ImBuf *imb_loadtarga(const unsigned char *mem,
                             size_t size,
                             int flags,
@@ -83,7 +83,7 @@ struct ImBuf *imb_loadtarga(const unsigned char *mem,
 bool imb_savetarga(struct ImBuf *ibuf, const char *filepath, int flags);
 
 /* iris */
-int imb_is_a_iris(const unsigned char *mem);
+bool imb_is_a_iris(const unsigned char *mem, const size_t size);
 struct ImBuf *imb_loadiris(const unsigned char *mem,
                            size_t size,
                            int flags,
@@ -91,7 +91,7 @@ struct ImBuf *imb_loadiris(const unsigned char *mem,
 bool imb_saveiris(struct ImBuf *ibuf, const char *filepath, int flags);
 
 /* jp2 */
-int imb_is_a_jp2(const unsigned char *buf);
+bool imb_is_a_jp2(const unsigned char *buf, const size_t size);
 struct ImBuf *imb_load_jp2(const unsigned char *mem,
                            size_t size,
                            int flags,
@@ -102,7 +102,7 @@ struct ImBuf *imb_load_jp2_filepath(const char *filepath,
 bool imb_save_jp2(struct ImBuf *ibuf, const char *filepath, int flags);
 
 /* jpeg */
-int imb_is_a_jpeg(const unsigned char *mem);
+bool imb_is_a_jpeg(const unsigned char *mem, const size_t size);
 bool imb_savejpeg(struct ImBuf *ibuf, const char *filepath, int flags);
 struct ImBuf *imb_load_jpeg(const unsigned char *buffer,
                             size_t size,
@@ -110,7 +110,7 @@ struct ImBuf *imb_load_jpeg(const unsigned char *buffer,
                             char colorspace[IM_MAX_SPACE]);
 
 /* bmp */
-int imb_is_a_bmp(const unsigned char *buf);
+bool imb_is_a_bmp(const unsigned char *buf, const size_t size);
 struct ImBuf *imb_bmp_decode(const unsigned char *mem,
                              size_t size,
                              int flags,
@@ -118,7 +118,7 @@ struct ImBuf *imb_bmp_decode(const unsigned char *mem,
 bool imb_savebmp(struct ImBuf *ibuf, const char *filepath, int flags);
 
 /* cineon */
-int imb_is_a_cineon(const unsigned char *buf);
+bool imb_is_a_cineon(const unsigned char *buf, const size_t size);
 bool imb_save_cineon(struct ImBuf *buf, const char *filepath, int flags);
 struct ImBuf *imb_load_cineon(const unsigned char *mem,
                               size_t size,
@@ -126,7 +126,7 @@ struct ImBuf *imb_load_cineon(const unsigned char *mem,
                               char colorspace[IM_MAX_SPACE]);
 
 /* dpx */
-int imb_is_a_dpx(const unsigned char *buf);
+bool imb_is_a_dpx(const unsigned char *buf, const size_t size);
 bool imb_save_dpx(struct ImBuf *buf, const char *filepath, int flags);
 struct ImBuf *imb_load_dpx(const unsigned char *mem,
                            size_t size,
@@ -134,7 +134,7 @@ struct ImBuf *imb_load_dpx(const unsigned char *mem,
                            char colorspace[IM_MAX_SPACE]);
 
 /* hdr */
-int imb_is_a_hdr(const unsigned char *buf);
+bool imb_is_a_hdr(const unsigned char *buf, const size_t size);
 struct ImBuf *imb_loadhdr(const unsigned char *mem,
                           size_t size,
                           int flags,
@@ -143,7 +143,7 @@ bool imb_savehdr(struct ImBuf *ibuf, const char *filepath, int flags);
 
 /* tiff */
 void imb_inittiff(void);
-int imb_is_a_tiff(const unsigned char *buf);
+bool imb_is_a_tiff(const unsigned char *buf, const size_t size);
 struct ImBuf *imb_loadtiff(const unsigned char *mem,
                            size_t size,
                            int flags,