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

timepng: better errors, fix signed overflow

Browse Source 
Too many input files would overflow nfiles

Signed-off-by: John Bowler <jbowler@acm.org>
This commit is contained in:
John Bowler 2016-04-13 10:04:08 -07:00
parent 703944c39d
commit af9d06e06a
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/libtests/timepng.c
View File

@ -20,6 +20,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <limits.h>
#include <time.h> #include <time.h>
@ -279,6 +280,9 @@ static int add_one_file(FILE *fp, char *name)
ok = 1; /* read ok */ ok = 1; /* read ok */
} }
else
fprintf(stderr, "%s: file not added\n", name);
(void)fclose(ip); (void)fclose(ip);
/* An error in the output is fatal; exit immediately: */ /* An error in the output is fatal; exit immediately: */
@ -463,7 +467,13 @@ int main(int argc, char **argv)
for (i=1; i<argc; ++i) for (i=1; i<argc; ++i)
{ {
if (add_one_file(fp, argv[i])) if (nfiles == INT_MAX)
{
fprintf(stderr, "%s: skipped, too many files\n", argv[i]);
break;
}
else if (add_one_file(fp, argv[i]))
++nfiles; ++nfiles;
} }
} }
@ -479,7 +489,13 @@ int main(int argc, char **argv)
if (filename[len-1] == '\n') if (filename[len-1] == '\n')
{ {
filename[len-1] = 0; filename[len-1] = 0;
if (add_one_file(fp, filename)) if (nfiles == INT_MAX)
{
fprintf(stderr, "%s: skipped, too many files\n", filename);
break;
}
else if (add_one_file(fp, filename))
++nfiles; ++nfiles;
} }