commit 181db8ab737c2fbf73b1706879d00d97a72426d3
author LE GARREC Vincent <gitlab-freedesktop@le-garrec.fr> Sun Jan 27 16:43:15 2019 +0000
committer Albert Astals Cid <tsdgeos@yahoo.es> Sun Jan 27 16:43:15 2019 +0000
tree 5b6ebbcd80cef69dbc99b06eb7df43cb731fc0dc
parent c3577325de5b9d59539c2413dcc66283df062ffa

ofz-8467: Undefined-shift in CMap::addCIDs

poppler/CMap.cc

diff --git a/poppler/CMap.cc b/poppler/CMap.cc
index 4c5f6fb..9953db3 100644
--- a/poppler/CMap.cc
+++ b/poppler/CMap.cc
@@ -18,6 +18,7 @@
 // Copyright (C) 2013 Fabio D'Urso <fabiodurso@hotmail.it>
 // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2018 Adam Reichold <adam.reichold@t-online.de>
+// Copyright (C) 2019 LE GARREC Vincent <legarrec.vincent@gmail.com>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -391,6 +392,10 @@
   int byte;
   unsigned int i, j;
 
+  if (nBytes > 4) {
+    error(errSyntaxError, -1, "Illegal entry in cidchar block in CMap");
+    return;
+  }
   vec = vector;
   for (i = nBytes - 1; i >= 1; --i) {
     byte = (start >> (8 * i)) & 0xff;