Bug 727401 - import libpng overflow patch from http://codereview.chro…

…mium.org/9363013 r=joe, a=akeybl CLOSED TREE
mozilla · Feb 16, 2012 · b6c34ce · b6c34ce
1 parent e5a7413
commit b6c34ce
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/media/libpng/pngrutil.c b/media/libpng/pngrutil.c
@@ -401,8 +401,15 @@ png_decompress_chunk(png_structp png_ptr, int comp_type,
       {
          /* Success (maybe) - really uncompress the chunk. */
          png_size_t new_size = 0;
-         png_charp text = png_malloc_warn(png_ptr,
-                        prefix_size + expanded_size + 1);
+         png_charp text = NULL;
+         /* Need to check for both truncation (64-bit platforms) and integer
+          * overflow.
+          */
+         if (prefix_size + expanded_size > prefix_size &&
+             prefix_size + expanded_size < 0xffffffffU)
+         {
+            text = png_malloc_warn(png_ptr, prefix_size + expanded_size + 1);
+         }
 
          if (text != NULL)
          {