Attachment 337646 Details for Bug 570183

[patch] interdiff

interdiff (text/plain), 2.60 KB, created by Marcus Meissner on 2010-01-20 12:54:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Meissner

Created: 2010-01-20 12:54:07 UTC

Size: 2.60 KB

patch

obsolete

>diff -u poppler-0.12.0/goo/gmem.cc poppler-0.12.0/goo/gmem.cc
>--- poppler-0.12.0/goo/gmem.cc
>+++ poppler-0.12.0/goo/gmem.cc
>@@ -536,4 +536,12 @@
>+void *gmallocn(int nObjs, int objSize) GMEM_EXCEP {
>+  return gmallocn(nObjs, objSize, false);
>+}
>+
> void *gmallocn_checkoverflow(SafeInt nObjs, SafeInt objSize) GMEM_EXCEP {
>   return gmallocn(nObjs, objSize, true);
> }
> 
>+void *gmallocn_checkoverflow(int nObjs, int objSize) GMEM_EXCEP {
>+  return gmallocn(nObjs, objSize, true);
>+}
>+
>@@ -588,4 +596,13 @@
>+void *greallocn(void *p, int nObjs, int objSize) GMEM_EXCEP {
>+  return greallocn(p, nObjs, objSize, false);
>+}
>+
>+
> void *greallocn_checkoverflow(void *p, SafeInt nObjs, SafeInt objSize) GMEM_EXCEP {
>   return greallocn(p, nObjs, objSize, true);
> }
> 
>+void *greallocn_checkoverflow(void *p, int nObjs, int objSize) GMEM_EXCEP {
>+  return greallocn(p, nObjs, objSize, true);
>+}
>+
>diff -u poppler-0.12.0/goo/gmem.h poppler-0.12.0/goo/gmem.h
>--- poppler-0.12.0/goo/gmem.h
>+++ poppler-0.12.0/goo/gmem.h
>@@ -44,6 +44,7 @@
> 
> #endif // USE_EXCEPTIONS
> 
>+#ifdef __cplusplus
> class SafeInt
> {
>   int c;
>@@ -135,6 +136,7 @@
> SafeInt operator*(const int& left, const SafeInt& right);
> SafeInt operator/(const int& left, const SafeInt& right);
> SafeInt operator%(const int& left, const SafeInt& right);
>+#endif
> 
> #ifdef __cplusplus
> extern "C" {
>@@ -162,12 +164,12 @@
>  * The gmallocn_checkoverflow variant returns NULL instead of exiting
>  * the application if a overflow is detected
>  */
>-extern void *gmallocn(SafeInt nObjs, SafeInt objSize) GMEM_EXCEP;
>-extern void *gmallocn_checkoverflow(SafeInt nObjs, SafeInt objSize) GMEM_EXCEP;
>+extern void *gmallocn(int nObjs, int objSize) GMEM_EXCEP;
>+extern void *gmallocn_checkoverflow(int nObjs, int objSize) GMEM_EXCEP;
> extern void *gmallocn3(int a, int b, int c) GMEM_EXCEP;
> extern void *gmallocn3_checkoverflow(int a, int b, int c) GMEM_EXCEP;
>-extern void *greallocn(void *p, SafeInt nObjs, SafeInt objSize) GMEM_EXCEP;
>-extern void *greallocn_checkoverflow(void *p, SafeInt nObjs, SafeInt objSize) GMEM_EXCEP;
>+extern void *greallocn(void *p, int nObjs, int objSize) GMEM_EXCEP;
>+extern void *greallocn_checkoverflow(void *p, int nObjs, int objSize) GMEM_EXCEP;
> 
> /*
>  * Same as free, but checks for and ignores NULL pointers.
>@@ -199,2 +201,10 @@
> 
>+
>+#ifdef __cplusplus
>+extern void *gmallocn(SafeInt nObjs, SafeInt objSize) GMEM_EXCEP;
>+extern void *gmallocn_checkoverflow(SafeInt nObjs, SafeInt objSize) GMEM_EXCEP;
>+extern void *greallocn(void *p, SafeInt nObjs, SafeInt objSize) GMEM_EXCEP;
>+extern void *greallocn_checkoverflow(void *p, SafeInt nObjs, SafeInt objSize) GMEM_EXCEP;
>+#endif
>+
> #endif

Actions: View | Diff

Attachments on bug 570183: 336274 | 337644 | 337646