diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2006-10-26 15:13:11 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2006-10-26 15:13:11 +0000 |
| commit | 02dd49fe72ca941bf35b66b31019139dd8e4e377 (patch) | |
| tree | 75bae67b624e7ad96c284afb4c7cd4b1f7935c3d | |
| parent | 111180e9ec6772eb480179f96dbb581118670922 (diff) | |
| download | netpbm-mirror-02dd49fe72ca941bf35b66b31019139dd8e4e377.tar.gz netpbm-mirror-02dd49fe72ca941bf35b66b31019139dd8e4e377.tar.xz netpbm-mirror-02dd49fe72ca941bf35b66b31019139dd8e4e377.zip | |
Release 10.36.06
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@112 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | Makefile.version | 2 | ||||
| -rw-r--r-- | doc/HISTORY | 4 | ||||
| -rw-r--r-- | lib/libpam.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.version b/Makefile.version index dc3557ff..986efb6f 100644 --- a/Makefile.version +++ b/Makefile.version @@ -1,4 +1,4 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 36 -NETPBM_POINT_RELEASE = 05 +NETPBM_POINT_RELEASE = 06 diff --git a/doc/HISTORY b/doc/HISTORY index d5db699d..2c2d9045 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,10 @@ Netpbm. CHANGE HISTORY -------------- +06.10.26 BJH Release 10.36.06 + + pnm_readpaminit(): Don't crash if width == 0. + 06.10.22 BJH Release 10.36.05 ppmtompeg: fix reading of GOP files. Thanks Alun Jones. diff --git a/lib/libpam.c b/lib/libpam.c index 6d2acba7..60d446d9 100644 --- a/lib/libpam.c +++ b/lib/libpam.c @@ -90,7 +90,7 @@ validateComputableSize(struct pam * const pamP) { if (depth > INT_MAX/sizeof(sample)) pm_error("image depth (%u) too large to be processed", depth); - else if (depth * sizeof(sample) > INT_MAX/pamP->width) + else if (pamP->width > 0 && depth * sizeof(sample) > INT_MAX/pamP->width) pm_error("image width and depth (%u, %u) too large " "to be processed.", pamP->width, depth); else if (pamP->width * (depth * sizeof(sample)) > |