Blob Blame Raw
From 89a5367d49b2556a2635dbb6d48d6a6b182a2c6c Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Thu, 23 May 2019 00:54:29 +0200
Subject: [PATCH] JPEG2000Stream: fail gracefully if not all components have
 the same WxH

I think this is just a mistake, or at least the only file we have with
this scenario is a fuzzed one
---
 poppler/JPEG2000Stream.cc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/poppler/JPEG2000Stream.cc b/poppler/JPEG2000Stream.cc
index 15bbcae4..0eea3a2d 100644
--- a/poppler/JPEG2000Stream.cc
+++ b/poppler/JPEG2000Stream.cc
@@ -4,7 +4,7 @@
 //
 // A JPX stream decoder using OpenJPEG
 //
-// Copyright 2008-2010, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright 2008-2010, 2012, 2019 Albert Astals Cid <aacid@kde.org>
 // Copyright 2011 Daniel Glรถckner <daniel-gl@gmx.net>
 // Copyright 2013 Adrian Johnson <ajohnson@redneon.com>
 //
@@ -253,6 +253,12 @@ void JPXStream::init()
         close();
         break;
       }
+      const int componentPixels = image->comps[component].w * image->comps[component].h;
+      if (componentPixels != npixels) {
+        error(errSyntaxWarning, -1, "Component {0:d} has different WxH than component 0", component);
+        close();
+        break;
+      }
       unsigned char *cdata = (unsigned char *)image->comps[component].data;
       int adjust = 0;
       if (image->comps[component].prec > 8)
-- 
2.21.0