File leaks-a1e2dc8.patch of Package xv

Overview Repositories Revisions Requests Users Attributes Meta

File leaks-a1e2dc8.patch of Package xv (Revision 97e0b62ff5d6602c82ce47d83c65f049)

Currently displaying revision 97e0b62ff5d6602c82ce47d83c65f049 , Show latest

From 9c2e7aed74ac79c9130f5284dc9edb35afbbfb6f Mon Sep 17 00:00:00 2001
From: William Bader <william@newspapersystems.com>
Date: Mon, 2 Sep 2024 05:53:59 +0200
Subject: [PATCH] xv.c, xvimage.c, xvjpeg.c: Ensure that exifInfo is freed.
 This fixes a memory leak reported by LeakSanitizer in LoadJFIF.

---
 src/xv.c      |   10 +++++++++-
 src/xvimage.c |    4 ++++
 src/xvjpeg.c  |   14 +++++++++-----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/xv.c b/src/xv.c
--- a/src/xv.c
+++ b/src/xv.c
@@ -214,7 +214,6 @@ int main(int argc, char **argv)
 
   picComments = (char *) NULL;
 
-  if (picExifInfo) free(picExifInfo);
   picExifInfo = (byte *) NULL;
   picExifInfoSize = 0;
 
@@ -2201,6 +2200,7 @@ static int openPic(int filenum)
   /* init important fields of pinfo */
   pinfo.pic = (byte *) NULL;
   pinfo.comment = (char *) NULL;
+  pinfo.exifInfo = (byte *) NULL;
   pinfo.numpages = 1;
   pinfo.pagebname[0] = '\0';
 
@@ -2652,6 +2652,10 @@ ms_auto_no:
       free(pinfo.comment);
     }
     pinfo.comment = (char *) NULL;
+    if (pinfo.exifInfo) {
+      free(pinfo.exifInfo);
+    }
+    pinfo.exifInfo = (byte *) NULL;
     goto FAILED;
   }
 
@@ -2703,6 +2707,10 @@ ms_auto_no:
       free(pinfo.comment);
     }
     pinfo.comment = (char *) NULL;
+    if (pinfo.exifInfo) {
+      free(pinfo.exifInfo);
+    }
+    pinfo.exifInfo = (byte *) NULL;
     Warning();
     goto FAILED;
   }
diff --git a/src/xvimage.c b/src/xvimage.c
--- a/src/xvimage.c
+++ b/src/xvimage.c
@@ -1448,6 +1448,10 @@ void KillOldPics(void)
   if (picComments) free(picComments);
   picComments = (char *) NULL;
   ChangeCommentText();
+
+  if (picExifInfo) free(picExifInfo);
+  picExifInfo = (byte *) NULL;
+  picExifInfoSize = 0;
 }
 
 
diff --git a/src/xvjpeg.c b/src/xvjpeg.c
--- a/src/xvjpeg.c
+++ b/src/xvjpeg.c
@@ -77,11 +77,11 @@ static    int          writeJFIF
 
 
 /*** local variables ***/
-static char *filename;
-static const char *fbasename;
-static char *comment;
-static byte *exifInfo;
-static int   exifInfoSize;   /* not a string => must track size explicitly */
+static char *filename = NULL;
+static const char *fbasename = NULL;
+static char *comment = NULL;
+static byte *exifInfo = NULL;
+static int   exifInfoSize = 0;   /* not a string => must track size explicitly */
 static int   colorType;
 
 static DIAL  qDial, smDial;
@@ -518,7 +518,11 @@ int LoadJFIF(char *fname, PICINFO *pinfo
 
   fbasename = BaseName(fname);
   pic       = (byte *) NULL;
+
+  if (comment) free(comment);
   comment   = (char *) NULL;
+
+  if (exifInfo) free(exifInfo);
   exifInfo  = (byte *) NULL;
   colorspace_name = "Color";

Places

File leaks-a1e2dc8.patch of Package xv (Revision 97e0b62ff5d6602c82ce47d83c65f049)

Places