[patch] netpbm-format-security.patch

netpbm-format-security.patch (text/plain), 2.64 KB, created by René Rhéaume on 2015-07-11 21:09:05 UTC

--- netpbm-10.61.02.orig/converter/pbm/cmuwmtopbm.c
+++ netpbm-10.61.02/converter/pbm/cmuwmtopbm.c
@@ -48,20 +48,20 @@
 
     rc = pm_readbiglong(ifP, &l);
     if (rc == -1 )
-        pm_error(initReadError);
+        pm_error("%s", initReadError);
     if ((uint32_t)l != cmuwmMagic)
         pm_error("bad magic number in CMU window manager file");
     rc = pm_readbiglong(ifP, &l);
     if (rc == -1)
-        pm_error(initReadError);
+        pm_error("%s", initReadError);
     *colsP = l;
     rc = pm_readbiglong(ifP, &l);
     if (rc == -1 )
-        pm_error(initReadError);
+        pm_error("%s", initReadError);
     *rowsP = l;
     rc = pm_readbigshort(ifP, &s);
     if (rc == -1)
-        pm_error(initReadError);
+        pm_error("%s", initReadError);
     *depthP = s;
 }
 
--- netpbm-10.61.02.orig/converter/other/tifftopnm.c
+++ netpbm-10.61.02/converter/other/tifftopnm.c
@@ -1459,7 +1459,7 @@
         int ok;
         ok = TIFFRGBAImageOK(tif, emsg);
         if (!ok) {
-            pm_message(emsg);
+            pm_message("%s", emsg);
             *statusP = CONV_UNABLE;
         } else {
             uint32 * raster;
@@ -1479,14 +1479,14 @@
                 
                 ok = TIFFRGBAImageBegin(&img, tif, stopOnErrorFalse, emsg);
                 if (!ok) {
-                    pm_message(emsg);
+                    pm_message("%s", emsg);
                     *statusP = CONV_FAILED;
                 } else {
                     int ok;
                     ok = TIFFRGBAImageGet(&img, raster, cols, rows);
                     TIFFRGBAImageEnd(&img) ;
                     if (!ok) {
-                        pm_message(emsg);
+                        pm_message("%s", emsg);
                         *statusP = CONV_FAILED;
                     } else {
                         *statusP = CONV_DONE;
--- netpbm-10.61.02.orig/converter/other/fiasco/pnmtofiasco.c
+++ netpbm-10.61.02/converter/other/fiasco/pnmtofiasco.c
@@ -170,7 +170,7 @@
       return 0;
    else
    {
-      fprintf (stderr, fiasco_get_error_message ());
+      fprintf (stderr, "%s", fiasco_get_error_message ());
       fprintf (stderr, "\n");
       return 1;
    }
--- netpbm-10.61.02.orig/converter/other/fiasco/params.c
+++ netpbm-10.61.02/converter/other/fiasco/params.c
@@ -656,7 +656,7 @@
     fprintf (stderr, "Usage: %s [OPTION]...%s\n", progname,
              non_opt_string ? non_opt_string : " ");
     if (synopsis != NULL)
-        fprintf (stderr, synopsis);
+        fprintf (stderr, "%s", synopsis);
     fprintf (stderr, "\n\n");
     fprintf (stderr, "Mandatory or optional arguments to long options "
              "are mandatory or optional\nfor short options too. "