Changeset 25434

Timestamp:

Sep 17, 2009, 3:56:04 PM (17 years ago)

Author:

bills

Message:

range check the source coordinates before dereferencing the mask image

File:

• trunk/magic/remove/src/streaksremove.c (modified) (1 diff)

trunk/magic/remove/src/streaksremove.c

@@ -864 +864 @@
             psF32 y = psMetadataLookupF32(NULL, row, "Y_PSF");
 
-            psImageMaskType mask = maskImage->data.PS_TYPE_IMAGE_MASK_DATA[(int)y][(int)x];
+            psImageMaskType mask;
+            if ((x >= maskImage->numCols) || (y >= maskImage->numRows) || (x <  0) || (y < 0)) {
+                mask = maskStreak;
+            } else {
+                mask = maskImage->data.PS_TYPE_IMAGE_MASK_DATA[(int)y][(int)x];
+            }
 
             // Key the source if the center pixel is not masked with maskStreak