Added debug logging of free_nullsafe() calls as well

7 files changed, 27 insertions, 27 deletions

diff --git a/eurephiadm/commands/adminaccess.c b/eurephiadm/commands/adminaccess.c
index 179db97..f0daf61 100644
--- a/eurephiadm/commands/adminaccess.c
+++ b/eurephiadm/commands/adminaccess.c
@@ -391,7 +391,7 @@ int cmd_AdminAccess(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg
 
         // Call the mode function
         rc = mode_fnc(ctx, sess, cfg, mode_argc, mode_argv);
-        free_nullsafe(mode_argv);
+        free_nullsafe(ctx, mode_argv);
 
         return rc;
 }
diff --git a/eurephiadm/commands/attempts.c b/eurephiadm/commands/attempts.c
index 75cbdd6..0ce6455 100644
--- a/eurephiadm/commands/attempts.c
+++ b/eurephiadm/commands/attempts.c
@@ -371,7 +371,7 @@ int cmd_Attempts(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, i
 
         // Call the mode function
         rc = mode_fnc(ctx, sess, cfg, mode_argc, mode_argv);
-        free_nullsafe(mode_argv);
+        free_nullsafe(ctx, mode_argv);
 
         return rc;
 
diff --git a/eurephiadm/commands/blacklist.c b/eurephiadm/commands/blacklist.c
index 69d5962..8227a18 100644
--- a/eurephiadm/commands/blacklist.c
+++ b/eurephiadm/commands/blacklist.c
@@ -371,7 +371,7 @@ int cmd_Blacklist(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg,
 
         // Call the mode function
         rc = mode_fnc(ctx, sess, cfg, mode_argc, mode_argv);
-        free_nullsafe(mode_argv);
+        free_nullsafe(ctx, mode_argv);
 
         return rc;
 
diff --git a/eurephiadm/commands/certificates.c b/eurephiadm/commands/certificates.c
index 5e81e06..469d28d 100644
--- a/eurephiadm/commands/certificates.c
+++ b/eurephiadm/commands/certificates.c
@@ -200,8 +200,8 @@ int register_certificate(eurephiaCTX *ctx, int depth, const char *digest,
                 fprintf(stderr, "%s: Failed to register certificate\n", MODULE);
         }
         xmlFreeDoc(cert_xml);
-        free_nullsafe(cname_cp);
-        free_nullsafe(org_cp);
+        free_nullsafe(ctx, cname_cp);
+        free_nullsafe(ctx, org_cp);
 
         return certid;
 }
@@ -354,10 +354,10 @@ int add_cert(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, int a
         // register_certificate returns value < 1, it means registration failed => rc = 1
         rc = (register_certificate(ctx, depth, digest, cname, org, email) < 1);
  exit:
-        free_nullsafe(digest);
-        free_nullsafe(cname);
-        free_nullsafe(org);
-        free_nullsafe(email);
+        free_nullsafe(ctx, digest);
+        free_nullsafe(ctx, cname);
+        free_nullsafe(ctx, org);
+        free_nullsafe(ctx, email);
         return rc;
 }
 
@@ -492,8 +492,8 @@ int delete_cert(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, in
  exit:
         xmlFreeDoc(certlist);
         xmlFreeDoc(cert_xml);
-        free_nullsafe(cname);
-        free_nullsafe(org);
+        free_nullsafe(ctx, cname);
+        free_nullsafe(ctx, org);
         return rc;
 }
 
@@ -640,7 +640,7 @@ int cmd_Certificates(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cf
 
         // Call the mode function
         rc = mode_fnc(ctx, sess, cfg, mode_argc, mode_argv);
-        free_nullsafe(mode_argv);
+        free_nullsafe(ctx, mode_argv);
 
         return rc;
 }
diff --git a/eurephiadm/commands/fwprofiles.c b/eurephiadm/commands/fwprofiles.c
index 4eac0f1..3f79017 100644
--- a/eurephiadm/commands/fwprofiles.c
+++ b/eurephiadm/commands/fwprofiles.c
@@ -398,7 +398,7 @@ int cmd_fwProfiles(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg,
 
         // Call the mode function
         rc = mode_fnc(ctx, sess, cfg, mode_argc, mode_argv);
-        free_nullsafe(mode_argv);
+        free_nullsafe(ctx, mode_argv);
 
         return rc;
 
diff --git a/eurephiadm/commands/usercerts.c b/eurephiadm/commands/usercerts.c
index a86d232..208f816 100644
--- a/eurephiadm/commands/usercerts.c
+++ b/eurephiadm/commands/usercerts.c
@@ -542,7 +542,7 @@ int cmd_UserCerts(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg,
 
         // Call the mode function
         rc = mode_fnc(ctx, sess, cfg, mode_argc, mode_argv);
-        free_nullsafe(mode_argv);
+        free_nullsafe(ctx, mode_argv);
 
         return rc;
 }
diff --git a/eurephiadm/commands/users.c b/eurephiadm/commands/users.c
index 66b3bce..7e6c215 100644
--- a/eurephiadm/commands/users.c
+++ b/eurephiadm/commands/users.c
@@ -567,20 +567,20 @@ int account_activation(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *
 
                         get_console_input(newpwd, 64, "Password for user:", 1);
                         if( strlen_nullsafe(newpwd) < 4 ) {
-                                free_nullsafe(newpwd);
-                                free_nullsafe(chkpwd);
+                                free_nullsafe(ctx, newpwd);
+                                free_nullsafe(ctx, chkpwd);
                                 fprintf(stderr, "%s: Password is too short\n", MODULE);
                                 goto exit;
                         }
 
                         get_console_input(chkpwd, 64, "Verify password for user:", 1);
                         if( strcmp(newpwd, chkpwd) != 0 ) {
-                                free_nullsafe(newpwd);
-                                free_nullsafe(chkpwd);
+                                free_nullsafe(ctx, newpwd);
+                                free_nullsafe(ctx, chkpwd);
                                 fprintf(stderr, "%s: Passwords didn't match\n", MODULE);
                                 goto exit;
                         }
-                        free_nullsafe(chkpwd);
+                        free_nullsafe(ctx, chkpwd);
                 }
 
                 // Update with new password
@@ -588,7 +588,7 @@ int account_activation(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *
                 xmlNewProp(tmp_n, (xmlChar *) "pwhash", (xmlChar *) "none");
                 rc = eDBadminUpdateUser(ctx, atoi_nullsafe(uid_str), update_xml);
 
-                free_nullsafe(newpwd);
+                free_nullsafe(ctx, newpwd);
                 break;
 
         case 'D':  // Delete user account
@@ -759,20 +759,20 @@ int add_user(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, int a
 
                 get_console_input(passwd, 64, "Password for user:", 1);
                 if( strlen_nullsafe(passwd) < 4 ) {
-                        free_nullsafe(passwd);
-                        free_nullsafe(chkpwd);
+                        free_nullsafe(ctx, passwd);
+                        free_nullsafe(ctx, chkpwd);
                         fprintf(stderr, "%s: Password is too short\n", MODULE);
                         return 1;
                 }
 
                 get_console_input(chkpwd, 64, "Verify password for user:", 1);
                 if( strcmp(passwd, chkpwd) != 0 ) {
-                        free_nullsafe(passwd);
-                        free_nullsafe(chkpwd);
+                        free_nullsafe(ctx, passwd);
+                        free_nullsafe(ctx, chkpwd);
                         fprintf(stderr, "%s: Passwords didn't match\n", MODULE);
                         return 1;
                 }
-                free_nullsafe(chkpwd);
+                free_nullsafe(ctx, chkpwd);
         }
 
 
@@ -793,7 +793,7 @@ int add_user(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, int a
                 fprintf(stderr, "%s: Failed to register user\n", MODULE);
         }
         memset(passwd, 0, strlen_nullsafe(passwd));
-        free_nullsafe(passwd);
+        free_nullsafe(ctx, passwd);
         xmlFreeDoc(user_xml);
 
         if( (digest != NULL) || (certfile != NULL) ) {
@@ -991,7 +991,7 @@ int cmd_Users(eurephiaCTX *ctx, eurephiaSESSION *sess, eurephiaVALUES *cfg, int
 
         // Call the mode function
         rc = mode_fnc(ctx, sess, cfg, mode_argc, mode_argv);
-        free_nullsafe(mode_argv);
+        free_nullsafe(ctx, mode_argv);
 
         return rc;
 }