Attachment 124161 Details for Bug 96269 – memory-leak-colorMap.patch

[patch] memory-leak-colorMap.patch

memory-leak-colorMap.patch (text/plain), 2.99 KB, created by LE GARREC Vincent on 2016-05-29 17:36:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: LE GARREC Vincent

Created: 2016-05-29 17:36:41 UTC

Size: 2.99 KB

patch

obsolete

>--- poppler/Gfx.cc.old	2016-05-29 19:14:06.373218269 +0200
>+++ poppler/Gfx.cc	2016-05-29 19:20:45.515476303 +0200
>@@ -4495,6 +4495,7 @@ void Gfx::doImage(Object *ref, Stream *s
>     if (smaskObj.isStream()) {
>       // soft mask
>       if (inlineImg) {
>+        delete colorMap;
> 	goto err1;
>       }
>       maskStr = smaskObj.getStream();
>@@ -4505,6 +4506,7 @@ void Gfx::doImage(Object *ref, Stream *s
> 	maskDict->lookup("W", &obj1);
>       }
>       if (!obj1.isInt()) {
>+        delete colorMap;
> 	goto err2;
>       }
>       maskWidth = obj1.getInt();
>@@ -4515,6 +4517,7 @@ void Gfx::doImage(Object *ref, Stream *s
> 	maskDict->lookup("H", &obj1);
>       }
>       if (!obj1.isInt()) {
>+        delete colorMap;
> 	goto err2;
>       }
>       maskHeight = obj1.getInt();
>@@ -4535,6 +4538,7 @@ void Gfx::doImage(Object *ref, Stream *s
> 	maskDict->lookup("BPC", &obj1);
>       }
>       if (!obj1.isInt()) {
>+        delete colorMap;
> 	goto err2;
>       }
>       maskBits = obj1.getInt();
>@@ -4556,6 +4560,7 @@ void Gfx::doImage(Object *ref, Stream *s
>       maskColorSpace = GfxColorSpace::parse(NULL, &obj1, out, state);
>       obj1.free();
>       if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
>+        delete colorMap;
> 	goto err1;
>       }
>       maskDict->lookup("Decode", &obj1);
>@@ -4567,6 +4572,7 @@ void Gfx::doImage(Object *ref, Stream *s
>       obj1.free();
>       if (!maskColorMap->isOk()) {
> 	delete maskColorMap;
>+        delete colorMap;
> 	goto err1;
>       }
>       // handle the Matte entry
>@@ -4612,6 +4618,7 @@ void Gfx::doImage(Object *ref, Stream *s
> 	} else {
> 	  error(errSyntaxError, -1, "Mask entry should be an integer but it's of type {0:d}", obj1.getType());
> 	  obj1.free();
>+          delete colorMap;
> 	  goto err1;
> 	}
> 	obj1.free();
>@@ -4620,6 +4627,7 @@ void Gfx::doImage(Object *ref, Stream *s
>     } else if (maskObj.isStream()) {
>       // explicit mask
>       if (inlineImg) {
>+        delete colorMap;
> 	goto err1;
>       }
>       maskStr = maskObj.getStream();
>@@ -4630,6 +4638,9 @@ void Gfx::doImage(Object *ref, Stream *s
> 	maskDict->lookup("W", &obj1);
>       }
>       if (!obj1.isInt()) {
>+        delete colorMap;
>+        maskObj.free();
>+        smaskObj.free();
> 	goto err2;
>       }
>       maskWidth = obj1.getInt();
>@@ -4640,6 +4651,9 @@ void Gfx::doImage(Object *ref, Stream *s
> 	maskDict->lookup("H", &obj1);
>       }
>       if (!obj1.isInt()) {
>+        delete colorMap;
>+        maskObj.free();
>+        smaskObj.free();
> 	goto err2;
>       }
>       maskHeight = obj1.getInt();
>@@ -4660,6 +4674,9 @@ void Gfx::doImage(Object *ref, Stream *s
> 	maskDict->lookup("IM", &obj1);
>       }
>       if (!obj1.isBool() || !obj1.getBool()) {
>+        delete colorMap;
>+        maskObj.free();
>+        smaskObj.free();
> 	goto err2;
>       }
>       obj1.free();
>@@ -4678,6 +4695,9 @@ void Gfx::doImage(Object *ref, Stream *s
> 	}
> 	obj2.free();
>       } else if (!obj1.isNull()) {
>+        delete colorMap;
>+        maskObj.free();
>+        smaskObj.free();
> 	goto err2;
>       }
>       obj1.free();

Actions: View | Splinter Review

Attachments on bug 96269: 124160 | 124161 | 124163

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.