about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2022-09-24 20:19:38 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2022-09-24 20:19:38 +0000
commit30afec0b7050d438e664f123b4faa97f9f7e6e20 (patch)
tree892d7a858c633b6b2dbef580acb5f0891acd5f7d
parentf95b41755a0e27e4b51f5951d888b7bdabf1cb2f (diff)
downloadnetpbm-mirror-30afec0b7050d438e664f123b4faa97f9f7e6e20.tar.gz
netpbm-mirror-30afec0b7050d438e664f123b4faa97f9f7e6e20.tar.xz
netpbm-mirror-30afec0b7050d438e664f123b4faa97f9f7e6e20.zip
Release 10.99.03
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@4437 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY5
-rwxr-xr-xeditor/pnmmargin7
-rw-r--r--version.mk2
3 files changed, 13 insertions, 1 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index a1344de5..95735cf6 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,11 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+not yet  BJH  Release 10.99.03
+
+              pnmmargin: fix shell injection vulnerability.  Always broken
+              (Program was added in primordial Netpbm in 1990).
+
 22.08.03 BJH  Release 10.99.02
 
               pnmindex: fix shell injection vulnerabilities.  Broken since
diff --git a/editor/pnmmargin b/editor/pnmmargin
index e8851bda..a62e5e44 100755
--- a/editor/pnmmargin
+++ b/editor/pnmmargin
@@ -67,6 +67,13 @@ fi
 size="$1"
 shift
 
+case $size in
+    ''|*[!0-9]*)
+        echo "Size argument '$size' is not a whole number"
+        exit 1
+        ;;
+esac
+
 if [ ${2-""} ] ; then
     echo "usage: $0 [-white|-black|-color <colorspec>] <size> [pnmfile]" 1>&2
     exit 1
diff --git a/version.mk b/version.mk
index 45a9d029..bb914d76 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 99
-NETPBM_POINT_RELEASE = 2
+NETPBM_POINT_RELEASE = 3