Merge pull request google#198 from Shivam7-1/patch-2

lvandeve · web-flow · commit ccf9f0588d4a · 2024-04-11T11:55:08.000+02:00
Multiplication result converted to larger type (Mitigate Arithmetic Overflow in Memory Allocation)
diff --git a/src/zopflipng/lodepng/lodepng_util.cpp b/src/zopflipng/lodepng/lodepng_util.cpp
@@ -1151,7 +1151,7 @@ unsigned convertToXYZ(float* out, float whitepoint[3], const unsigned char* in,
     use_icc = validateICC(&icc);
   }
 
-  data = (unsigned char*)lodepng_malloc(w * h * (bit16 ? 8 : 4));
+  data = (unsigned char*)lodepng_malloc((size_t)w * (size_t)h * (bit16 ? 8 : 4));
   error = lodepng_convert(data, in, &tempmode, mode_in, w, h);
   if(error) goto cleanup;
 

Original file line number	Diff line number	Diff line change
`@@ -1151,7 +1151,7 @@ unsigned convertToXYZ(float* out, float whitepoint[3], const unsigned char* in,`
`1151`	`1151`	`use_icc = validateICC(&icc);`
`1152`	`1152`	`}`
`1153`	`1153`
`1154`		`- data = (unsigned char)lodepng_malloc(w h * (bit16 ? 8 : 4));`
	`1154`	`+ data = (unsigned char)lodepng_malloc((size_t)w (size_t)h * (bit16 ? 8 : 4));`
`1155`	`1155`	`error = lodepng_convert(data, in, &tempmode, mode_in, w, h);`
`1156`	`1156`	`if(error) goto cleanup;`
`1157`	`1157`