about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2021-03-22 01:23:27 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2021-03-22 01:23:27 +0000
commita7fca291a0c78333da13e855bdb73aa819ba8649 (patch)
tree615e505bc03a0f31d2512327cd7c00ff02e549e1
parentb722c09c991306f5ce77a310195e9b1262547ef1 (diff)
downloadnetpbm-mirror-a7fca291a0c78333da13e855bdb73aa819ba8649.tar.gz
netpbm-mirror-a7fca291a0c78333da13e855bdb73aa819ba8649.tar.xz
netpbm-mirror-a7fca291a0c78333da13e855bdb73aa819ba8649.zip
Release 10.93.03
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@4058 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--converter/other/pnmtops.c4
-rw-r--r--doc/HISTORY6
-rw-r--r--version.mk2
3 files changed, 9 insertions, 3 deletions
diff --git a/converter/other/pnmtops.c b/converter/other/pnmtops.c
index 45d856d0..8c9167fb 100644
--- a/converter/other/pnmtops.c
+++ b/converter/other/pnmtops.c
@@ -1012,8 +1012,8 @@ validateComputableBoundingBox(float const scols,
     float const bbWidth  = llx + scols + 0.5;
     float const bbHeight = lly + srows + 0.5;
 
-    if (bbHeight < INT_MIN || bbHeight > INT_MAX ||
-        bbWidth  < INT_MIN || bbWidth  > INT_MAX)
+    if ((double)bbHeight < INT_MIN || (double)bbHeight > INT_MAX ||
+        (double)bbWidth  < INT_MIN || (double)bbWidth  > INT_MAX)
         pm_error("Bounding box dimensions %.1f x %.1f are too large "
                  "for computations.  "
                  "This probably means input image width, height, "
diff --git a/doc/HISTORY b/doc/HISTORY
index dd608210..922320de 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,12 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+21.03.22 BJH  Release 10.93.03
+
+              pnmtops: Fix incorrect output (arithmetic overflow) when
+              bounding box is exactly INT_MAX high or wide.  Always broken.
+              Pnmtops was in primordial Netpbm.
+
 21.03.10 BJH  Release 10.93.02
 
               pnmtopng: fix incorrect transparency in output when requesting
diff --git a/version.mk b/version.mk
index 2d079536..daa09ece 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 93
-NETPBM_POINT_RELEASE = 2
+NETPBM_POINT_RELEASE = 3