diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2017-04-04 15:27:27 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2017-04-04 15:27:27 +0000 |
| commit | 60eb8ee4bf3e0878031ec10989b9c8069972e89d (patch) | |
| tree | 7fec135fbe6f5df974801cff1b090589acc0a5bd | |
| parent | ca561223546a7e8acd055d5b2114869dd88f5114 (diff) | |
| download | netpbm-mirror-60eb8ee4bf3e0878031ec10989b9c8069972e89d.tar.gz netpbm-mirror-60eb8ee4bf3e0878031ec10989b9c8069972e89d.tar.xz netpbm-mirror-60eb8ee4bf3e0878031ec10989b9c8069972e89d.zip | |
Release 10.78.01
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2937 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rwxr-xr-x | buildtools/debian/mkdeb | 4 | ||||
| -rw-r--r-- | converter/other/pnmtojpeg.c | 4 | ||||
| -rw-r--r-- | doc/HISTORY | 8 | ||||
| -rw-r--r-- | version.mk | 2 |
4 files changed, 14 insertions, 4 deletions
diff --git a/buildtools/debian/mkdeb b/buildtools/debian/mkdeb index d1a88dc8..011d75b2 100755 --- a/buildtools/debian/mkdeb +++ b/buildtools/debian/mkdeb @@ -428,7 +428,9 @@ sub buildDpkgBuildTree($$$$$) { makePkgConfig("$dpkgDirName/usr/lib/pkgconfig/netpbm.pc", $templateSubsR, $netpbmPkgDir); - makeManweb($dpkgDirName, $netpbmPkgDir); + # Beginning in Netpbm 10.78 (March 2017_, 'make package' doesn't package + # the manweb stuff, so we no longer put it in the Debian package. + #makeManweb($dpkgDirName, $netpbmPkgDir); } diff --git a/converter/other/pnmtojpeg.c b/converter/other/pnmtojpeg.c index 86cb3eea..44826245 100644 --- a/converter/other/pnmtojpeg.c +++ b/converter/other/pnmtojpeg.c @@ -231,7 +231,7 @@ parseCommandLine(const int argc, char ** argv, char ** argv_parse; /* argv, except we modify it as we parse */ - MALLOCARRAY(argv_parse, argc); + MALLOCARRAY(argv_parse, argc + 1); /* +1 for the terminating null ptr */ option_def_index = 0; /* incremented by OPTENTRY */ OPTENT3(0, "verbose", OPT_FLAG, NULL, &cmdlineP->verbose, 0); @@ -274,7 +274,7 @@ parseCommandLine(const int argc, char ** argv, /* Make private copy of arguments for pm_optParseOptions to corrupt */ argc_parse = argc; - for (i=0; i < argc; i++) argv_parse[i] = argv[i]; + for (i=0; i < argc+1; i++) argv_parse[i] = argv[i]; opt.opt_table = option_def; opt.short_allowed = FALSE; /* We have no short (old-fashioned) options */ diff --git a/doc/HISTORY b/doc/HISTORY index 7816967c..d45b2baf 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,14 @@ Netpbm. CHANGE HISTORY -------------- +17.04.04 BJH Release 10.78.01 + + pnmtojpeg: fix array bounds violation in argument list. Always + broken (pnmtojpeg was new to Netpbm in Netpbm 8.2 (March 2000). + + Debian packaging: fix bug: don't try to include Manweb files, as + it is no longer packaged by 'make package'. + 17.03.28 BJH Release 10.78.00 ppmpat: Add -color. diff --git a/version.mk b/version.mk index 28ae0067..e0f87ef3 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 78 -NETPBM_POINT_RELEASE = 0 +NETPBM_POINT_RELEASE = 1 |