diff options
-rw-r--r-- | Makefile.version | 2 | ||||
-rw-r--r-- | buildtools/libopt.c | 32 | ||||
-rw-r--r-- | doc/HISTORY | 5 |
3 files changed, 21 insertions, 18 deletions
diff --git a/Makefile.version b/Makefile.version index 986efb6f..529de1ca 100644 --- a/Makefile.version +++ b/Makefile.version @@ -1,4 +1,4 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 36 -NETPBM_POINT_RELEASE = 06 +NETPBM_POINT_RELEASE = 07 diff --git a/buildtools/libopt.c b/buildtools/libopt.c index 132f05f2..3dcb1f73 100644 --- a/buildtools/libopt.c +++ b/buildtools/libopt.c @@ -351,6 +351,8 @@ parse_filename(const char * const filename, } } + + static void parse_filepath(const char * const filepath, const char ** const directory_p, @@ -453,9 +455,9 @@ processOneLibrary(const char * const filepath, linker option string as a newly malloced null-terminated string at *optionsP. -----------------------------------------------------------------------------*/ - const char *directory; + const char * directory; /* Directory component of 'filepath' */ - const char *filename; + const char * filename; /* Filename component of 'filepath' */ parse_filepath(filepath, &directory, &filename, errorP); @@ -510,22 +512,18 @@ main(int argc, char **argv) { else if (strcmp(argv[arg], "-quiet") == 0) quiet = TRUE; else { - if (strlen(argv[arg]) > 200) - error = TRUE; - else { - const char * options; - processOneLibrary(argv[arg], runtime, explicit, - &options, &error); - if (!error) { - if (strlen(outputLine) + strlen(options) + 1 + 1 > - sizeof(outputLine)) - error = TRUE; - else { - strcat(outputLine, " "); - strcat(outputLine, options); - } - strfree(options); + const char * options; + processOneLibrary(argv[arg], runtime, explicit, + &options, &error); + if (!error) { + if (strlen(outputLine) + strlen(options) + 1 + 1 > + sizeof(outputLine)) + error = TRUE; + else { + strcat(outputLine, " "); + strcat(outputLine, options); } + strfree(options); } } } diff --git a/doc/HISTORY b/doc/HISTORY index 2c2d9045..53307008 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,11 @@ Netpbm. CHANGE HISTORY -------------- +06.11.08 BJH Release 10.36.07 + + Build: remove unnecessary limit of 200 characters on + argument length in Libopt. + 06.10.26 BJH Release 10.36.06 pnm_readpaminit(): Don't crash if width == 0. |