walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fixed issues with get_num_images, moved the zero file check to prevent exicution of allocation and strcpy if there are no images.

This commit is contained in:
Eharve14 2022-01-13 16:29:30 -05:00
parent cbc8b26fb9
commit 912a144c27
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/jp2/opj_dump.c
View File

@ -126,7 +126,7 @@ static int get_num_images(char *imgdirpath)
{
DIR *dir;
struct dirent* content;
int num_images = 0;
unsigned int num_images = 0;
/*Reading the input images from given input directory*/
@ -141,6 +141,9 @@ static int get_num_images(char *imgdirpath)
continue;
}
num_images++;
if (num_images == 0) {
fprintf(stderr,"Too many files in folder %s\n", imgdirpath);
}
}
closedir(dir);
return num_images;
@ -510,7 +513,10 @@ int main(int argc, char *argv[])
if (img_fol.set_imgdir == 1) {
int it_image;
num_images = get_num_images(img_fol.imgdirpath);
if (num_images == 0) {
fprintf(stdout, "Folder is empty\n");
goto fails;
}
dirptr = (dircnt_t*)malloc(sizeof(dircnt_t));
if (!dirptr) {
return EXIT_FAILURE;
@ -536,10 +542,7 @@ int main(int argc, char *argv[])
if (load_images(dirptr, img_fol.imgdirpath) == 1) {
goto fails;
}
if (num_images == 0) {
fprintf(stdout, "Folder is empty\n");
goto fails;
}
} else {
num_images = 1;
}