From ec550654499ce8035d70ac466a6f78965ca2642e Mon Sep 17 00:00:00 2001
From: glennrp <glennrp@aa41f4f7-0bf4-0310-aa73-e5a19afd5a74>
Date: Sun, 21 Dec 2014 17:18:01 +0000
Subject: Impose a limit of 10 million columns or rows in an input PNG.

git-svn-id: https://subversion.imagemagick.org/subversion/ImageMagick/branches/ImageMagick-6@17368 aa41f4f7-0bf4-0310-aa73-e5a19afd5a74
origin:  http://trac.imagemagick.org/changeset/17368

diff --git a/coders/png.c b/coders/png.c
index e79a7d1..0057df2 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -2182,6 +2182,11 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
   png_set_benign_errors(ping, 1);
 #endif
 
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+  /* Reject images with more than 10 million rows or columns */
+  png_set_user_limits(ping, 10000000L, 10000000L);
+#endif /* PNG_SET_USER_LIMITS_SUPPORTED */
+
   /*
     Prepare PNG for reading.
   */
-- 
cgit v0.10.2