poppler/Hints.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
New commits: commit 71d327194293cb3d1a0e274eaf4451c7afe81e8a Merge: 7b2df1f 6a98b56 Author: Albert Astals Cid <[email protected]> Date: Fri May 17 23:04:12 2013 +0200 Merge remote-tracking branch 'origin/poppler-0.22' diff --cc poppler/Hints.cc index d76e019,2204932..ce00031 --- a/poppler/Hints.cc +++ b/poppler/Hints.cc @@@ -5,9 -5,8 +5,9 @@@ // This file is licensed under the GPLv2 or later // // Copyright 2010, 2012 Hib Eris <[email protected]> - // Copyright 2010, 2011 Albert Astals Cid <[email protected]> + // Copyright 2010, 2011, 2013 Albert Astals Cid <[email protected]> // Copyright 2010 Pino Toscano <[email protected]> +// Copyright 2013 Adrian Johnson <[email protected]> // //======================================================================== commit 6a98b56f6ded957477ddcccd4ff849a870020395 Author: Albert Astals Cid <[email protected]> Date: Fri May 17 23:01:20 2013 +0200 Make an invalid nSharedGroupsFirst a real error Instead trying to recover Fixes bug #46703 diff --git a/poppler/Hints.cc b/poppler/Hints.cc index 13bcc90..2204932 100644 --- a/poppler/Hints.cc +++ b/poppler/Hints.cc @@ -5,7 +5,7 @@ // This file is licensed under the GPLv2 or later // // Copyright 2010, 2012 Hib Eris <[email protected]> -// Copyright 2010, 2011 Albert Astals Cid <[email protected]> +// Copyright 2010, 2011, 2013 Albert Astals Cid <[email protected]> // Copyright 2010 Pino Toscano <[email protected]> // //======================================================================== @@ -282,7 +282,8 @@ void Hints::readSharedObjectsTable(Stream *str) } if ((!nSharedGroupsFirst) || (nSharedGroupsFirst > nSharedGroups)) { error(errSyntaxWarning, -1, "Invalid number of first page shared object groups"); - nSharedGroupsFirst = nSharedGroups; + nSharedGroups = 0; + return; } groupLength = (Guint *) gmallocn_checkoverflow(nSharedGroups, sizeof(Guint)); _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
