ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

yuvjpeg: fix NULL dereference on invalid format string

Browse Source 
(cherry picked from daala commit 82e51ebb8545d99316dbeaeeef3d7b5a929702e8)
This commit is contained in:
Tristan Matthews
2016-07-14 18:08:39 -04:00
parent 4b8d1ee39e
commit 24d2c9de3d
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
yuvjpeg.c
View File

@@ -91,8 +91,7 @@ void extend_edge(JSAMPLE *image, int width, int height, unsigned char *yuv,
int main(int argc, char *argv[]) {
long quality;
const char *size;
char *x;
int matches;
int luma_width;
int luma_height;
int chroma_width;
@@ -131,19 +130,8 @@ int main(int argc, char *argv[]) {
return 1;
}
size = argv[2];
x = strchr(size, 'x');
if (!x && x != size && x != (x + strlen(x) - 1)) {
fprintf(stderr, "Invalid image size input!\n");
return 1;
}
luma_width = (int)strtol(size, NULL, 10);
if (errno != 0) {
fprintf(stderr, "Invalid image size input!\n");
return 1;
}
luma_height = (int)strtol(x + 1, NULL, 10);
if (errno != 0) {
matches = sscanf(argv[2], "%dx%d", &luma_width, &luma_height);
if (matches != 2) {
fprintf(stderr, "Invalid image size input!\n");
return 1;
}