goo/gmem.c: Merge change from xpdf-3.01pl2

2 files changed, 15 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index a1fd540e..097838b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-01-11  Albert Astals Cid <aacid@kde.org>
 
+	* goo/gmem.c: Merge change from xpdf-3.01pl2
+
+2007-01-11  Albert Astals Cid <aacid@kde.org>
+
 	* poppler/Catalog.h:
 	* poppler/Catalog.cc: Limit max depth of recursive calls on
 	readPageTree to fix MOAB-06-01-2007
diff --git a/goo/gmem.c b/goo/gmem.c
index 6a7de57b..3380b660 100644
--- a/goo/gmem.c
+++ b/goo/gmem.c
@@ -141,8 +141,11 @@ void *grealloc(void *p, size_t size) {
 void *gmallocn(int nObjs, int objSize) {
   int n;
 
+  if (nObjs == 0) {
+    return NULL;
+  }
   n = nObjs * objSize;
-  if (objSize == 0 || n / objSize != nObjs) {
+  if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
     fprintf(stderr, "Bogus memory allocation size\n");
     exit(1);
   }
@@ -152,8 +155,14 @@ void *gmallocn(int nObjs, int objSize) {
 void *greallocn(void *p, int nObjs, int objSize) {
   int n;
 
+  if (nObjs == 0) {
+    if (p) {
+      gfree(p);
+    }
+    return NULL;
+  }
   n = nObjs * objSize;
-  if (objSize == 0 || n / objSize != nObjs) {
+  if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
     fprintf(stderr, "Bogus memory allocation size\n");
     exit(1);
   }