Changeset 11583

Timestamp:

07/07/08 10:10:18 (3 months ago)

Author:

cristy

Message:

 

Files:

• ImageMagick/trunk/magick/shear.c (modified) (2 diffs)

ImageMagick/trunk/magick/shear.c

@@ -578 +578 @@
   const long x,const long y)
 {
+  off_t
+    i;
+    
   unsigned short
-    value;
-
+    value; 
+    
+  i=(off_t) radon_info->height*x+y;
+  if ((i < 0) || 
+      ((i*sizeof(*radon_info->cells)) >= radon_info->length))
+    return(0);
   if (radon_info->type != DiskCache)
-    return(radon_info->cells[radon_info->height*x+y]);
+    return(radon_info->cells[i]);
   value=0;
-  (void) ReadRadonCell(radon_info,(off_t) (radon_info->height*x+y)*
-    sizeof(*radon_info->cells),sizeof(*radon_info->cells),
-    (unsigned char *) &value);
+  (void) ReadRadonCell(radon_info,i*sizeof(*radon_info->cells),
+    sizeof(*radon_info->cells),(unsigned char *) &value);
   return(value);
 }
@@ -593 +599 @@
   const long x,const long y,const unsigned short value)
 {
+  off_t
+    i;
+
   ssize_t
     count;
 
+  i=(off_t) radon_info->height*x+y;
+  if ((i < 0) || 
+      ((i*sizeof(*radon_info->cells)) >= radon_info->length))
+    return(0);
   if (radon_info->type != DiskCache)
     {
-      radon_info->cells[radon_info->height*x+y]=value;
+      radon_info->cells[i]=value;
       return(MagickTrue);
     }
-  count=WriteRadonCell(radon_info,(off_t) (radon_info->height*x+y)*
-    sizeof(*radon_info->cells),sizeof(*radon_info->cells),
-    (unsigned char *) &value);
+  count=WriteRadonCell(radon_info,i*sizeof(*radon_info->cells),
+    sizeof(*radon_info->cells),(unsigned char *) &value);
   if (count != (ssize_t) sizeof(*radon_info->cells))
     return(MagickFalse);