Added debug logging of free_nullsafe() calls as well

11 files changed, 43 insertions, 43 deletions

diff --git a/eurephiadm/client_config.c b/eurephiadm/client_config.c
index 8b24cf2..1629d82 100644
--- a/eurephiadm/client_config.c
+++ b/eurephiadm/client_config.c
@@ -121,7 +121,7 @@ eurephiaVALUES *parse_config_line(const char *line) {
         key = cp;
         val = strpbrk(cp, "=");
         if( val == NULL ) {
-                free_nullsafe(cp);
+                free_nullsafe(NULL, cp);
                 return NULL;
         }
         *val = '\0'; val++;
@@ -159,7 +159,7 @@ eurephiaVALUES *parse_config_line(const char *line) {
         ret->key = strdup(key);
         ret->val = strdup(val);
 
-        free_nullsafe(cp);
+        free_nullsafe(NULL, cp);
         return ret;
 }
 
@@ -205,7 +205,7 @@ eurephiaVALUES *ReadConfig(const char *env, const char *cfgname) {
                         eAdd_valuestruct(NULL, cfg, prm);
                 }
         };
-        free_nullsafe(buf);
+        free_nullsafe(NULL, buf);
         fclose(fp); fp = NULL;
 
         return cfg;
diff --git a/eurephiadm/client_context.c b/eurephiadm/client_context.c
index 6875087..aaec995 100644
--- a/eurephiadm/client_context.c
+++ b/eurephiadm/client_context.c
@@ -76,7 +76,7 @@ eurephiaCTX *eurephiaCTX_init(FILE *log, const int loglevel, eurephiaVALUES *cfg
                         ctx->log = NULL;
                 } else if( (ctx->log = fopen(logfile, "aw")) == NULL ) {
                         fprintf(stderr, "ERROR: Could not open log file: %s\n", logfile);
-                        free_nullsafe(ctx);
+                        free_nullsafe(NULL, ctx);
                         return NULL;
                 }
         } else {
@@ -99,7 +99,7 @@ eurephiaCTX *eurephiaCTX_init(FILE *log, const int loglevel, eurephiaVALUES *cfg
 
         if( !eDBlink_init(ctx, dbdriver, 2) ) {
                 eurephia_log(ctx, LOG_PANIC, 0, "Could not load the database driver");
-                free_nullsafe(ctx);
+                free_nullsafe(ctx, ctx);
                 return NULL;
         }
         return ctx;
@@ -137,5 +137,5 @@ void eurephiaCTX_destroy(eurephiaCTX *ctx) {
                 ctx->log = NULL;
                 ctx->loglevel = 0;
         }
-        free_nullsafe(ctx);
+        free_nullsafe(ctx, ctx);
 }
diff --git a/eurephiadm/client_session.c b/eurephiadm/client_session.c
index 0f3ec80..22334c2 100644
--- a/eurephiadm/client_session.c
+++ b/eurephiadm/client_session.c
@@ -177,15 +177,15 @@ eurephiaSESSION *create_session(eurephiaCTX *ctx, const char *sesskey) {
                         if( !eurephia_randstring(ctx, randdata, 512) ) {
                                 eurephia_log(ctx, LOG_FATAL, 0,
                                              "Could not generate enough random data for session");
-                                free_nullsafe(randdata);
-                                free_nullsafe(new_sess);
+                                free_nullsafe(ctx, randdata);
+                                free_nullsafe(ctx, new_sess);
                                 return NULL;
                         }
 
                         memset(&sha, 0, sizeof(SHA512Context));
                         memset(&sha_res, 0, SHA512_HASH_SIZE+2);
 
-                        free_nullsafe(new_sess->sessionkey);
+                        free_nullsafe(ctx, new_sess->sessionkey);
                         new_sess->sessionkey = (char *) malloc_nullsafe(ctx, (SHA512_HASH_SIZE*2) + 3);
                         assert(new_sess->sessionkey != NULL);
 
@@ -205,14 +205,14 @@ eurephiaSESSION *create_session(eurephiaCTX *ctx, const char *sesskey) {
                         uniqchk = eDBcheck_sessionkey_uniqueness(ctx, new_sess->sessionkey);
                         memset(randdata, 0, 514);
                 } while( (uniqchk == 0) && (loop < 11) );
-                free_nullsafe(randdata);
+                free_nullsafe(ctx, randdata);
 
                 if( uniqchk == 0 ) {
                         eurephia_log(ctx, LOG_FATAL, 0,
                                      "Did not manage to create a unique session key after %i attempts."
                                      "  Aborting.", loop-1);
-                        free_nullsafe(new_sess->sessionkey);
-                        free_nullsafe(new_sess);
+                        free_nullsafe(ctx, new_sess->sessionkey);
+                        free_nullsafe(ctx, new_sess);
                         return NULL;
                 }
         } else {
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;
 }
diff --git a/eurephiadm/eurephiadm.c b/eurephiadm/eurephiadm.c
index 10cf70e..518f8a5 100644
--- a/eurephiadm/eurephiadm.c
+++ b/eurephiadm/eurephiadm.c
@@ -232,7 +232,7 @@ int eurephia_ConnectDB(eurephiaCTX *ctx, const char *argstr) {
                 eDBlink_close(ctx);
                 return 0;
         }
-        free_nullsafe(cp);
+        free_nullsafe(ctx, cp);
        
         return 1;
 }
@@ -467,7 +467,7 @@ int main(int argc, char **argv) {
                         char *logout_argv[] = { sesskey_file };
                         rc = cmd_Logout(ctx, NULL, cfg, 0, logout_argv);
                         remove_session_file(ctx);
-                        free_nullsafe(sesskey_file);
+                        free_nullsafe(ctx, sesskey_file);
                         goto exit;
                 }
 
@@ -484,7 +484,7 @@ int main(int argc, char **argv) {
                         }
                 }
         }
-        free_nullsafe(sesskey_file);
+        free_nullsafe(ctx, sesskey_file);
 
 
         // If we have an open session now, call the requested command
@@ -500,7 +500,7 @@ int main(int argc, char **argv) {
                 rc = call_fnc->function(ctx, session, cfg, cmdargc, cmdargv);
                 argstr = args2string(cmdargc, cmdargv);
                 eurephia_log(ctx, LOG_INFO, 0, "Command: %s (result: %i)", argstr, rc);
-                free_nullsafe(argstr);
+                free_nullsafe(ctx, argstr);
 
                 // Remove session info from memory
                 eDBfree_session(ctx, session);