diff options
| -rw-r--r-- | doc/HISTORY | 5 | ||||
| -rwxr-xr-x | editor/pnmmargin | 7 | ||||
| -rw-r--r-- | version.mk | 2 |
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 |