File openjpeg2-CVE-2021-29338.patch of Package openjpeg2.36921

Index: openjpeg-2.1.0/src/bin/jp2/opj_compress.c
===================================================================
--- openjpeg-2.1.0.orig/src/bin/jp2/opj_compress.c
+++ openjpeg-2.1.0/src/bin/jp2/opj_compress.c
@@ -1591,10 +1591,10 @@ int main(int argc, char **argv) {
     /* Read directory if necessary */
     if(img_fol.set_imgdir==1){
         num_images=get_num_images(img_fol.imgdirpath);
-        dirptr=(dircnt_t*)malloc(sizeof(dircnt_t));
+        dirptr=(dircnt_t*)calloc(1, sizeof(dircnt_t));
         if(dirptr){
-            dirptr->filename_buf = (char*)malloc(num_images*OPJ_PATH_LEN*sizeof(char));	/* Stores at max 10 image file names*/
-            dirptr->filename = (char**) malloc(num_images*sizeof(char*));
+            dirptr->filename_buf = (char*)calloc(num_images, OPJ_PATH_LEN*sizeof(char));	/* Stores at max 10 image file names*/
+            dirptr->filename = (char**) calloc(num_images, sizeof(char*));
             if(!dirptr->filename_buf){
                 return 0;
             }
Index: openjpeg-2.1.0/src/bin/jp2/opj_decompress.c
===================================================================
--- openjpeg-2.1.0.orig/src/bin/jp2/opj_decompress.c
+++ openjpeg-2.1.0/src/bin/jp2/opj_decompress.c
@@ -713,8 +713,8 @@ int main(int argc, char **argv)
 
 		dirptr=(dircnt_t*)calloc(1, sizeof(dircnt_t));
 		if(dirptr){
-			dirptr->filename_buf = (char*)malloc((size_t)num_images*OPJ_PATH_LEN*sizeof(char));	/* Stores at max 10 image file names*/
-			dirptr->filename = (char**) malloc((size_t)num_images*sizeof(char*));
+			dirptr->filename_buf = (char*)calloc((size_t)num_images, OPJ_PATH_LEN*sizeof(char));	/* Stores at max 10 image file names*/
+			dirptr->filename = (char**) calloc((size_t)num_images, sizeof(char*));
 
 			if(!dirptr->filename_buf){
 				return EXIT_FAILURE;
Index: openjpeg-2.1.0/src/bin/jp2/opj_dump.c
===================================================================
--- openjpeg-2.1.0.orig/src/bin/jp2/opj_dump.c
+++ openjpeg-2.1.0/src/bin/jp2/opj_dump.c
@@ -444,10 +444,10 @@ int main(int argc, char *argv[])
 		int it_image;
 		num_images=get_num_images(img_fol.imgdirpath);
 
-		dirptr=(dircnt_t*)malloc(sizeof(dircnt_t));
+		dirptr=(dircnt_t*)calloc(1, sizeof(dircnt_t));
 		if(dirptr){
-			dirptr->filename_buf = (char*)malloc((size_t)num_images*OPJ_PATH_LEN*sizeof(char));	/* Stores at max 10 image file names*/
-			dirptr->filename = (char**) malloc((size_t)num_images*sizeof(char*));
+			dirptr->filename_buf = (char*)calloc((size_t)num_images, OPJ_PATH_LEN*sizeof(char));	/* Stores at max 10 image file names*/
+			dirptr->filename = (char**) calloc((size_t)num_images, sizeof(char*));
 
 			if(!dirptr->filename_buf){
 				return EXIT_FAILURE;