Attachment 3281 Details for Bug 4463 – A few remaning malloc where mallocn should be used

[patch] A few remaning malloc where mallocn should be used

poppler_allocn (text/plain), 2.98 KB, created by Marco Pesenti Gritti on 2005-09-15 03:15:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marco Pesenti Gritti

Created: 2005-09-15 03:15:06 UTC

Size: 2.98 KB

patch

obsolete

>? 01-xpdf-3.00pl1.patch
>? 02-xpdf-3.00pl2.patch
>? 03-xpdf-3.00pl3.patch
>? 10-xpdf-3.01-docs.patch
>? 11-xpdf-3.01-fixedpoint.patch
>? 12-xpdf-3.01-no-no-decryption.patch
>? 13-xpdf-3.01-goo-allocn.patch
>Index: poppler/ArthurOutputDev.cc
>===================================================================
>RCS file: /cvs/poppler/poppler/poppler/ArthurOutputDev.cc,v
>retrieving revision 1.8
>diff -u -r1.8 ArthurOutputDev.cc
>--- poppler/ArthurOutputDev.cc	4 Aug 2005 10:15:23 -0000	1.8
>+++ poppler/ArthurOutputDev.cc	15 Sep 2005 10:14:12 -0000
>@@ -378,7 +378,7 @@
>       break;
>     case fontCIDType2:
>       n = ((GfxCIDFont *)gfxFont)->getCIDToGIDLen();
>-      codeToGID = (Gushort *)gmalloc(n * sizeof(Gushort));
>+      codeToGID = (Gushort *)gmallocn(n, sizeof(Gushort));
>       memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(),
> 	     n * sizeof(Gushort));
>       if (!(fontFile = m_fontEngine->loadTrueTypeFont(
>Index: poppler/CairoFontEngine.cc
>===================================================================
>RCS file: /cvs/poppler/poppler/poppler/CairoFontEngine.cc,v
>retrieving revision 1.15
>diff -u -r1.15 CairoFontEngine.cc
>--- poppler/CairoFontEngine.cc	28 Jul 2005 17:34:19 -0000	1.15
>+++ poppler/CairoFontEngine.cc	15 Sep 2005 10:14:13 -0000
>@@ -112,7 +112,7 @@
>     
>     enc = ((Gfx8BitFont *)gfxFont)->getEncoding();
>     
>-    codeToGID = (Gushort *)gmalloc(256 * sizeof(int));
>+    codeToGID = (Gushort *)gmallocn(256, sizeof(int));
>     codeToGIDLen = 256;
>     for (i = 0; i < 256; ++i) {
>       codeToGID[i] = 0;
>@@ -125,7 +125,7 @@
>   case fontCIDType2:
>     n = ((GfxCIDFont *)gfxFont)->getCIDToGIDLen();
>     codeToGIDLen = n;
>-    codeToGID = (Gushort *)gmalloc(n * sizeof(Gushort));
>+    codeToGID = (Gushort *)gmallocn(n, sizeof(Gushort));
>     memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(),
> 	   n * sizeof(Gushort));
>     /* Fall through */
>Index: poppler/TextOutputDev.cc
>===================================================================
>RCS file: /cvs/poppler/poppler/poppler/TextOutputDev.cc,v
>retrieving revision 1.11
>diff -u -r1.11 TextOutputDev.cc
>--- poppler/TextOutputDev.cc	27 Aug 2005 08:43:43 -0000	1.11
>+++ poppler/TextOutputDev.cc	15 Sep 2005 10:14:27 -0000
>@@ -3036,7 +3036,7 @@
>     : TextSelectionVisitor(page)
> {
>   fragsSize = 256;
>-  frags = (TextLineFrag *)gmalloc(fragsSize * sizeof(TextLineFrag));
>+  frags = (TextLineFrag *)gmallocn(fragsSize, sizeof(TextLineFrag));
>   nFrags = 0;
> }
> 
>Index: poppler/UnicodeMap.cc
>===================================================================
>RCS file: /cvs/poppler/poppler/poppler/UnicodeMap.cc,v
>retrieving revision 1.1.1.1
>diff -u -r1.1.1.1 UnicodeMap.cc
>--- poppler/UnicodeMap.cc	3 Mar 2005 19:46:04 -0000	1.1.1.1
>+++ poppler/UnicodeMap.cc	15 Sep 2005 10:14:28 -0000
>@@ -53,7 +53,7 @@
>   map = new UnicodeMap(encodingNameA->copy());
> 
>   size = 8;
>-  map->ranges = (UnicodeMapRange *)gmalloc(size * sizeof(UnicodeMapRange));
>+  map->ranges = (UnicodeMapRange *)gmallocn(size, sizeof(UnicodeMapRange));
>   eMapsSize = 0;
> 
>   line = 1;

Actions: View | Splinter Review

Attachments on bug 4463: 3279 | 3280 | 3281 | 3282 | 3283 | 3284 | 3286 | 3287 | 3288 | 3289

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.