aboutsummaryrefslogtreecommitdiff
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 28 Feb 2019 20:29:00 +0100
Subject: [PATCH] netpbm: Fix CVE-2017-2587.

Copied verbatim from Debian[0].

[0]: https://sources.debian.org/data/main/n/netpbm-free/2:10.78.05-0.1/debian/patches/netpbm-CVE-2017-2587.patch

---
diff -urNp old/converter/other/svgtopam.c new/converter/other/svgtopam.c
--- old/converter/other/svgtopam.c	2017-02-08 12:11:02.593690917 +0100
+++ new/converter/other/svgtopam.c	2017-02-08 13:49:38.319029371 +0100
@@ -771,12 +771,17 @@ createCanvas(unsigned int const width,
 
     MALLOCVAR_NOFAIL(canvasP);
 
-    canvasP->width  = width;
-    canvasP->height = height;
-    canvasP->pixels = ppm_allocarray(width, height);
-    canvasP->maxval = maxval;
+    if(canvasP != NULL){
+        canvasP->width  = width;
+        canvasP->height = height;
+        canvasP->pixels = ppm_allocarray(width, height);
+        canvasP->maxval = maxval;
+
+        *canvasPP = canvasP;
+    } else {
+       pm_error("can't allocate memory for canvas");
+    }
 
-    *canvasPP = canvasP;
 }
 
 
dd groovy-xml. [arguments]: Add groovy-xml to the list of classes available for class loading. Julien Lepiller 2018-05-09gnu: Add groovy....* gnu/packages/groovy.scm (groovy): New variable. Julien Lepiller 2018-05-09gnu: Add groovy-macro....* gnu/packages/groovy.scm (groovy-macro): New variable. Julien Lepiller 2018-05-09gnu: Add groovy-testng....* gnu/packages/groovy.scm (groovy-testng): New variable. Julien Lepiller 2018-05-09gnu: Add groovy-sql....* gnu/packages/groovy.scm (groovy-sql): New variable. Julien Lepiller 2018-05-09gnu: Add groovy-servlet....* gnu/packages/groovy.scm (groovy-servlet): New variable. Julien Lepiller 2018-05-09gnu: Add groovy-nio....* gnu/packages/groovy.scm (groovy-nio): New variable. Julien Lepiller 2018-05-09gnu: Add groovy-jsr223....* gnu/packages/groovy.scm (groovy-jsr223): New variable. Julien Lepiller 2018-05-09gnu: Add groovy-json....* gnu/packages/groovy.scm (groovy-json): New variable. Julien Lepiller 2018-05-09gnu: Add groovy-jmx....* gnu/packages/groovy.scm (groovy-jmx): New variable. Julien Lepiller 2018-05-09gnu: Add groovy-groovysh....* gnu/packages/groovy.scm (groovy-groovysh): New variable. Julien Lepiller 2018-05-09gnu: Add groovy-docgenerator....* gnu/packages/groovy.scm (groovy-docgenerator): New variable. Julien Lepiller 2018-05-09gnu: Add groovy-console....* gnu/packages/groovy.scm (groovy-console): New variable. Julien Lepiller 2018-05-09gnu: Add groovy-swing....* gnu/packages/groovy.scm (groovy-swing): New variable. Julien Lepiller 2018-05-09gnu: Add groovy-bsf....* gnu/packages/groovy.scm (groovy-bsf): New variable. Julien Lepiller 2018-05-09gnu: Add groovy-ant....* gnu/packages/groovy.scm (groovy-ant): New variable. Julien Lepiller 2018-05-09gnu: Add groovy-groovydoc....* gnu/packages/groovy.scm (groovy-groovydoc): New variable. Julien Lepiller 2018-05-09gnu: Add groovy-templates....* gnu/packages/groovy.scm (groovy-templates): New variable. Julien Lepiller 2018-05-09gnu: Add groovy-xml....* gnu/packages/groovy.scm (groovy-xml): New variable. Julien Lepiller 2018-05-09gnu: Add groovy-test....* gnu/packages/groovy.scm (groovy-test): New variable. Julien Lepiller 2018-05-09gnu: Add groovy-tests-bootstrap....* gnu/packages/groovy.scm (groovy-tests-bootstrap): New variable. Julien Lepiller 2018-05-09gnu: Add groovy-bootstrap....* gnu/packages/groovy.scm (groovy-bootstrap): New variable. Julien Lepiller 2018-05-09gnu: Add java-groovy-bootstrap....* gnu/packages/groovy.scm: New file. * gnu/packages/patches/groovy-add-exceptionutilsgenerator.patch: New file. * gnu/local.mk (GNU_SYSTEM_MODULES, dist_patch_DATA): Add them. Julien Lepiller