check for margins < raw size; limit memmove in raw2image

perdrix52 · Aug 20, 2020 · d78c328 · d78c328
1 parent 4feaed4
commit d78c328
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/metadata/identify.cpp b/src/metadata/identify.cpp
@@ -1153,7 +1153,8 @@ void LibRaw::identify()
       pixel_aspect < 0.1 || pixel_aspect > 10. ||
       raw_height > 64000)
     is_raw = 0;
-
+   if(raw_width <= left_margin || raw_height <= top_margin)
+       is_raw = 0;
 #ifdef NO_JASPER
   if (load_raw == &LibRaw::redcine_load_raw)
   {

diff --git a/src/preprocessing/raw2image.cpp b/src/preprocessing/raw2image.cpp
@@ -494,8 +494,8 @@ int LibRaw::raw2image_ex(int do_subtract_black)
         {
           // legacy is always 4channel and not shrinked!
           memmove(imgdata.image, imgdata.rawdata.color4_image,
-                  MIN(S.raw_width - S.left_margin, S.width) *
-                      MIN(S.raw_height - S.top_margin, S.height) *
+                  MAX(0,MIN(S.raw_width - S.left_margin, S.width)) *
+                      MAX(0,MIN(S.raw_height - S.top_margin, S.height)) *
                       sizeof(*imgdata.image));
         }
       }