cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tiffcrop.c: Avoid new clang warning about tools/tiffcrop.c "size argument in 'strncat' call appears to be size of the source".

Browse Source
This commit is contained in:
Bob Friesenhahn 2018-12-01 09:16:10 -06:00
parent 5bcf0cb3c1
commit d6f7cf744c
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/tiffcrop.c
View File

@ -2103,7 +2103,7 @@ void process_command_opts (int argc, char *argv[], char *mp, char *mode, uint32
* autoindex is set to non-zero. Update page and file counters * autoindex is set to non-zero. Update page and file counters
* so TIFFTAG PAGENUM will be correct in image. * so TIFFTAG PAGENUM will be correct in image.
*/ */
static int static int
update_output_file (TIFF **tiffout, char *mode, int autoindex, update_output_file (TIFF **tiffout, char *mode, int autoindex,
char *outname, unsigned int *page) char *outname, unsigned int *page)
{ {
@ -2114,17 +2114,18 @@ update_output_file (TIFF **tiffout, char *mode, int autoindex,
char exportname[PATH_MAX]; char exportname[PATH_MAX];
if (autoindex && (*tiffout != NULL)) if (autoindex && (*tiffout != NULL))
{ {
/* Close any export file that was previously opened */ /* Close any export file that was previously opened */
TIFFClose (*tiffout); TIFFClose (*tiffout);
*tiffout = NULL; *tiffout = NULL;
} }
strcpy (export_ext, ".tiff"); strcpy (export_ext, ".tiff");
memset (exportname, '\0', PATH_MAX); memset (filenum, '\0', sizeof(filenum));
memset (exportname, '\0', sizeof(exportname));
/* Leave room for page number portion of the new filename */ /* Leave room for page number portion of the new filename */
strncpy (exportname, outname, PATH_MAX - sizeof(filenum)); strncpy (exportname, outname, sizeof(exportname) - sizeof(filenum));
if (*tiffout == NULL) /* This is a new export file */ if (*tiffout == NULL) /* This is a new export file */
{ {
if (autoindex) if (autoindex)
@ -2141,16 +2142,17 @@ update_output_file (TIFF **tiffout, char *mode, int autoindex,
/* MAX_EXPORT_PAGES limited to 6 digits to prevent string overflow of pathname */ /* MAX_EXPORT_PAGES limited to 6 digits to prevent string overflow of pathname */
if (findex > MAX_EXPORT_PAGES) if (findex > MAX_EXPORT_PAGES)
{ {
TIFFError("update_output_file", "Maximum of %d pages per file exceeded", MAX_EXPORT_PAGES); TIFFError("update_output_file", "Maximum of %d pages per file exceeded", MAX_EXPORT_PAGES);
return 1; return 1;
} }
snprintf(filenum, sizeof(filenum), "-%03d%.5s", findex, export_ext); snprintf(filenum, sizeof(filenum), "-%03d%.5s", findex, export_ext);
filenum[sizeof(filenum)-1] = '\0'; filenum[sizeof(filenum)-1] = '\0';
strncat (exportname, filenum, sizeof(filenum)-1); /* We previously assured that there will be space for 'filenum' */
strcat (exportname, filenum);
} }
exportname[PATH_MAX - 1] = '\0'; exportname[sizeof(exportname) - 1] = '\0';
*tiffout = TIFFOpen(exportname, mode); *tiffout = TIFFOpen(exportname, mode);
if (*tiffout == NULL) if (*tiffout == NULL)
@ -2158,11 +2160,11 @@ update_output_file (TIFF **tiffout, char *mode, int autoindex,
TIFFError("update_output_file", "Unable to open output file %s", exportname); TIFFError("update_output_file", "Unable to open output file %s", exportname);
return 1; return 1;
} }
*page = 0; *page = 0;
return 0; return 0;
} }
else else
(*page)++; (*page)++;
return 0; return 0;