commit f81833aed68ec7d04ecdeb7f4f7566040f24300e
author DRC <information@libjpeg-turbo.org> Wed Jan 08 15:01:38 2020 -0600
committer DRC <information@libjpeg-turbo.org> Wed Jan 08 15:01:38 2020 -0600
tree 24bc876ae80e8d1c1ef0c7a55f579ce6f80adeb4
parent 00607ec260efa4cfe10f9b36d6e3d3590ae92d79

Remove more unnecessary NULL checks before free()

cjpeg.c

diff --git a/cjpeg.c b/cjpeg.c
index 07e7db1..52a6005 100644
--- a/cjpeg.c
+++ b/cjpeg.c
@@ -682,12 +682,10 @@
 
   if (memdst) {
     fprintf(stderr, "Compressed size:  %lu bytes\n", outsize);
-    if (outbuffer != NULL)
-      free(outbuffer);
+    free(outbuffer);
   }
 
-  if (icc_profile != NULL)
-    free(icc_profile);
+  free(icc_profile);
 
   /* All done. */
   exit(jerr.num_warnings ? EXIT_WARNING : EXIT_SUCCESS);

djpeg.c

diff --git a/djpeg.c b/djpeg.c
index 40e93e6..e127cf7 100644
--- a/djpeg.c
+++ b/djpeg.c
@@ -813,7 +813,7 @@
   end_progress_monitor((j_common_ptr)&cinfo);
 #endif
 
-  if (memsrc && inbuffer != NULL)
+  if (memsrc)
     free(inbuffer);
 
   /* All done. */

jdatadst-tj.c

diff --git a/jdatadst-tj.c b/jdatadst-tj.c
index f6ded64..fdaa2de 100644
--- a/jdatadst-tj.c
+++ b/jdatadst-tj.c
@@ -103,8 +103,7 @@
 
   MEMCOPY(nextbuffer, dest->buffer, dest->bufsize);
 
-  if (dest->newbuffer != NULL)
-    free(dest->newbuffer);
+  free(dest->newbuffer);
 
   dest->newbuffer = nextbuffer;
 

jdatadst.c

diff --git a/jdatadst.c b/jdatadst.c
index 3168b96..246fffb 100644
--- a/jdatadst.c
+++ b/jdatadst.c
@@ -143,8 +143,7 @@
 
   MEMCOPY(nextbuffer, dest->buffer, dest->bufsize);
 
-  if (dest->newbuffer != NULL)
-    free(dest->newbuffer);
+  free(dest->newbuffer);
 
   dest->newbuffer = nextbuffer;
 

jpegtran.c

diff --git a/jpegtran.c b/jpegtran.c
index 058e844..28cde2f 100644
--- a/jpegtran.c
+++ b/jpegtran.c
@@ -591,8 +591,7 @@
   end_progress_monitor((j_common_ptr)&dstinfo);
 #endif
 
-  if (icc_profile != NULL)
-    free(icc_profile);
+  free(icc_profile);
 
   /* All done. */
   exit(jsrcerr.num_warnings + jdsterr.num_warnings ?