diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2017-12-30 20:24:17 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2017-12-30 20:24:17 +0000 |
| commit | a24369691a810b5cb4f929618b080d82c8200938 (patch) | |
| tree | d3d07e8452fd82145946a10e815d2b0634b26408 | |
| parent | a5fb397b3ab3ac6b2c17c72598036bedbdca1816 (diff) | |
| download | netpbm-mirror-a24369691a810b5cb4f929618b080d82c8200938.tar.gz netpbm-mirror-a24369691a810b5cb4f929618b080d82c8200938.tar.xz netpbm-mirror-a24369691a810b5cb4f929618b080d82c8200938.zip | |
Release 10.80.02
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@3100 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | converter/ppm/sldtoppm.c | 8 | ||||
| -rw-r--r-- | doc/HISTORY | 7 | ||||
| -rw-r--r-- | version.mk | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/converter/ppm/sldtoppm.c b/converter/ppm/sldtoppm.c index 707f6d6f..550eed5b 100644 --- a/converter/ppm/sldtoppm.c +++ b/converter/ppm/sldtoppm.c @@ -196,7 +196,7 @@ slidefind(const char * const sname, /* Read slide library header and verify. */ if ((fread(libent, 32, 1, slfile) != 1) || - (!streq((char *)libent, "AutoCAD Slide Library 1.0\015\012\32"))) { + (!strneq((char *)libent, "AutoCAD Slide Library 1.0\015\012\32", 32))) { pm_error("not an AutoCAD slide library file."); } pos = 32; @@ -208,14 +208,14 @@ slidefind(const char * const sname, readCt = fread(libent, 36, 1, slfile); if (readCt != 1) eof = true; - else if (strlen((char *)libent) == 0) + else if (strnlen((char *)libent, 32) == 0) eof = true; if (!eof) { pos += 36; if (dironly) { pm_message(" %s", libent); - } else if (streq((char *)libent, uname)) { + } else if (strneq((char *)libent, uname, 32)) { long dpos; dpos = (((((libent[35] << 8) | libent[34]) << 8) | @@ -350,7 +350,7 @@ slider(slvecfn slvec, /* Verify that slide format is compatible with this program. */ - if (!streq(slfrof.slh, slhi.slh)) + if (!STRSEQ(slfrof.slh, slhi.slh)) pm_error("this is not an AutoCAD slide file."); /* Verify that the number format and file level in the header are diff --git a/doc/HISTORY b/doc/HISTORY index 69948c09..5b39fb91 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,7 +4,12 @@ Netpbm. CHANGE HISTORY -------------- -17.10.21 BJH Release 10.81.00 +17.12.30 BJH Release 10.80.02 + +sldtoppm: fix bug: wild memory accesses, weird messages when + invalid input file has unterminated strings. + +17.10.21 BJH Release 10.80.01 sldtoppm: -lib and -dir don't work - always says slide not found. Broken in Netpbm 10.63 (June 2013). diff --git a/version.mk b/version.mk index 534a65b2..ba31783b 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 80 -NETPBM_POINT_RELEASE = 1 +NETPBM_POINT_RELEASE = 2 |