commit 32a53e5c9f8284757021c128ead0d0b172ec37eb
author Stefan Berger <stefanb@linux.ibm.com> Fri Aug 18 09:51:31 2023 -0400
committer Stefan Berger <stefanb@us.ibm.com> Sat Aug 19 09:18:09 2023 -0400
tree 5df1335b59876b6c3ba9253ee9f47038fc20651d
parent efa030b9dadd46af870d39e4b44bb50ebb00bd1d

swtpm_utils: Use SWTPM_G_FREE macro to free memory and set pointer to NULL

Use the macro in swtpm_setup.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>

src/swtpm_setup/swtpm_setup.c

diff --git a/src/swtpm_setup/swtpm_setup.c b/src/swtpm_setup/swtpm_setup.c
index aafa448..a42256c 100644
--- a/src/swtpm_setup/swtpm_setup.c
+++ b/src/swtpm_setup/swtpm_setup.c
@@ -278,10 +278,8 @@
                 }
                 g_strfreev(lines);
 
-                g_free(standard_output);
-                standard_output = NULL;
-                g_free(standard_error);
-                standard_error = NULL;
+                SWTPM_G_FREE(standard_output);
+                SWTPM_G_FREE(standard_error);
             }
         }
     }
@@ -379,8 +377,7 @@
                 g_free(certfile);
                 certfile = g_strjoin(G_DIR_SEPARATOR_S, certsdir, flags_to_certfiles[idx].filename, NULL);
 
-                g_free(filecontent);
-                filecontent = NULL;
+                SWTPM_G_FREE(filecontent);
                 ret = read_file(certfile, &filecontent, &filecontent_len);
                 if (ret != 0)
                     return 1;
@@ -620,8 +617,7 @@
             certfile = g_strjoin(G_DIR_SEPARATOR_S, certsdir,
                                  flags_to_certfiles[idx].filename, NULL);
 
-            g_free(filecontent);
-            filecontent = NULL;
+            SWTPM_G_FREE(filecontent);
             ret = read_file(certfile, &filecontent, &filecontent_len);
             if (ret != 0)
                 return 1;

src/utils/swtpm_utils.h

diff --git a/src/utils/swtpm_utils.h b/src/utils/swtpm_utils.h
index 897993c..7dbee1a 100644
--- a/src/utils/swtpm_utils.h
+++ b/src/utils/swtpm_utils.h
@@ -23,6 +23,12 @@
         (FD) = -1;	\
     }
 
+#define SWTPM_G_FREE(var)	\
+    do {		\
+        g_free(var);	\
+        var = NULL;	\
+    } while(0)
+
 extern gchar *gl_LOGFILE;
 
 void append_to_file(const char *pathname, const char *str);