summaryrefslogtreecommitdiffstats
path: root/database
diff options
context:
space:
mode:
Diffstat (limited to 'database')
-rw-r--r--database/eurephiadb_mapping.c6
-rw-r--r--database/sqlite/administration.c4
-rw-r--r--database/sqlite/edb-sqlite.c26
-rw-r--r--database/sqlite/sqlite.c32
4 files changed, 34 insertions, 34 deletions
diff --git a/database/eurephiadb_mapping.c b/database/eurephiadb_mapping.c
index fbb4584..52c9778 100644
--- a/database/eurephiadb_mapping.c
+++ b/database/eurephiadb_mapping.c
@@ -71,8 +71,8 @@ void eDBfreeMapping(eDBfieldMap *p) {
// Release value and this pointer.
// Do not attempt to release field_name, as it is a constant char *
- free_nullsafe(p->value);
- free_nullsafe(p->table_alias);
+ free_nullsafe(NULL, p->value);
+ free_nullsafe(NULL, p->table_alias);
free(p);
}
@@ -325,7 +325,7 @@ char *eDBmkSortKeyString(eDBfieldMap *tfmap, const char *skeys_str) {
}
tok = strtok(NULL, delims);
}
- free_nullsafe(cp);
+ free_nullsafe(NULL, cp);
sortkeys[strlen(sortkeys)-1] = '\0';
eDBfreeMapping(sk_map);
diff --git a/database/sqlite/administration.c b/database/sqlite/administration.c
index f3527c0..a8725b3 100644
--- a/database/sqlite/administration.c
+++ b/database/sqlite/administration.c
@@ -158,7 +158,7 @@ int eDBadminAuth(eurephiaCTX *ctx, const char *req_access, const char *uname, co
pwdok = ((crpwd != NULL) && (strcmp(crpwd, dbpwd) == 0) ? 1 : 0);
memset(crpwd, 0, strlen_nullsafe(crpwd));
memset(dbpwd, 0, strlen_nullsafe(dbpwd));
- free_nullsafe(crpwd);
+ free_nullsafe(ctx, crpwd);
if( pwdok == 0 ) {
eurephia_log(ctx, LOG_WARNING, 0, "Authentication failed.");
sleep(2);
@@ -1356,7 +1356,7 @@ xmlDoc *eDBadminGetLastlog(eurephiaCTX *ctx, xmlDoc *srch, const char *sortkeys)
for( fptr = fmap; fptr != NULL; fptr = fptr->next) {
switch( fptr->field_id ) {
case FIELD_UNAME:
- free_nullsafe(fptr->table_alias);
+ free_nullsafe(ctx, fptr->table_alias);
default:
break;
}
diff --git a/database/sqlite/edb-sqlite.c b/database/sqlite/edb-sqlite.c
index c1aa1c0..d4ef84d 100644
--- a/database/sqlite/edb-sqlite.c
+++ b/database/sqlite/edb-sqlite.c
@@ -123,8 +123,8 @@ int eDBconnect(eurephiaCTX *ctx, const int argc, const char **argv)
rc = sqlite3_open(argv[0], (void *) &dbc->dbhandle);
if( rc ) {
eurephia_log(ctx, LOG_PANIC, 0, "Could not open database '%s'", dbc->dbname);
- free_nullsafe(dbc->dbname);
- free_nullsafe(dbc);
+ free_nullsafe(ctx, dbc->dbname);
+ free_nullsafe(ctx, dbc);
return 0;
}
@@ -170,12 +170,12 @@ void eDBdisconnect(eurephiaCTX *ctx)
// Close database connection
sqlite3_close((sqlite3 *) dbc->dbhandle);
- free_nullsafe(dbc->dbname);
+ free_nullsafe(ctx, dbc->dbname);
dbc->dbhandle = NULL;
// Free up config memory
eFree_values(ctx, dbc->config);
- free_nullsafe(dbc);
+ free_nullsafe(ctx, dbc);
ctx->dbc = NULL;
}
@@ -214,7 +214,7 @@ int eDBauth_TLS(eurephiaCTX *ctx, const char *org, const char *cname, const char
update_attempts(ctx, blid);
certid = -1;
}
- free_nullsafe(blid);
+ free_nullsafe(ctx, blid);
} else {
eurephia_log(ctx, LOG_FATAL, 0, "Could not look up certificate information");
}
@@ -249,7 +249,7 @@ int eDBauth_user(eurephiaCTX *ctx, const int certid, const char *username, const
" WHERE uc.certid = '%i' AND ou.username = '%q'",
certid, username);
memset(crpwd, 0, strlen_nullsafe(crpwd));
- free_nullsafe(crpwd);
+ free_nullsafe(ctx, crpwd);
if( res == NULL ) {
eurephia_log(ctx, LOG_FATAL, 0,
"Could not lookup user in database (certid %i, username '%s'", certid, username);
@@ -273,7 +273,7 @@ int eDBauth_user(eurephiaCTX *ctx, const int certid, const char *username, const
pwdok = ((crpwd != NULL) && (strcmp(crpwd, dbpwd) == 0) ? 1 : 0);
memset(crpwd, 0, strlen_nullsafe(crpwd));
memset(dbpwd, 0, strlen_nullsafe(dbpwd));
- free_nullsafe(crpwd);
+ free_nullsafe(ctx, crpwd);
}
if( blid_uname != NULL ) {
@@ -414,14 +414,14 @@ int eDBblacklist_check(eurephiaCTX *ctx, const int type, const char *val)
sqlite_free_results(blr);
blacklisted = 1; // [type] is blacklisted
}
- free_nullsafe(atpid);
+ free_nullsafe(ctx, atpid);
} else {
eurephia_log(ctx, LOG_CRITICAL, 0, "Quering openvpn_attempts for blacklisted %s failed",
eDBattempt_types[type].descr);
}
- free_nullsafe(atpr);
+ free_nullsafe(ctx, atpr);
}
- free_nullsafe(blid);
+ free_nullsafe(ctx, blid);
DEBUG(ctx, 20, "Result - function call: eDBblacklist_check(ctx, '%s', '%s') - %i",
eDBattempt_types[type].descr, val, blacklisted);
@@ -511,9 +511,9 @@ void eDBregister_attempt(eurephiaCTX *ctx, int type, int mode, const char *value
}
sqlite_free_results(res);
}
- free_nullsafe(id);
- free_nullsafe(atmpt_block);
- free_nullsafe(blid);
+ free_nullsafe(ctx, id);
+ free_nullsafe(ctx, atmpt_block);
+ free_nullsafe(ctx, blid);
}
diff --git a/database/sqlite/sqlite.c b/database/sqlite/sqlite.c
index 5faa0b7..8646ea6 100644
--- a/database/sqlite/sqlite.c
+++ b/database/sqlite/sqlite.c
@@ -65,13 +65,13 @@ void _sqlite_free_results(dbresult *inres)
do {
if( fld != fld->prevfield ) {
fld = fld->nextfield;
- free_nullsafe(fld->prevfield->value);
- free_nullsafe(fld->prevfield);
+ free_nullsafe(NULL, fld->prevfield->value);
+ free_nullsafe(NULL, fld->prevfield);
}
} while( fld != tup );
tup = tup->nexttuple;
- free_nullsafe(fld->value);
- free_nullsafe(fld);
+ free_nullsafe(NULL, fld->value);
+ free_nullsafe(NULL, fld);
} while( tup != inres->tuples );
}
@@ -81,14 +81,14 @@ void _sqlite_free_results(dbresult *inres)
do {
if( hdr != hdr->prev ) {
hdr = hdr->next;
- free_nullsafe(hdr->prev->name);
- free_nullsafe(hdr->prev);
+ free_nullsafe(NULL, hdr->prev->name);
+ free_nullsafe(NULL, hdr->prev);
}
} while( hdr != inres->headerrec );
- free_nullsafe(hdr->name);
- free_nullsafe(hdr);
+ free_nullsafe(NULL, hdr->name);
+ free_nullsafe(NULL, hdr);
}
- free_nullsafe(inres);
+ free_nullsafe(NULL, inres);
}
@@ -232,7 +232,7 @@ dbresult *sqlite_query(eurephiaCTX *ctx, char *fmt, ... ) {
if( rc != SQLITE_OK ) {
eurephia_log(ctx, LOG_ERROR, 0, "SQL Error: %s", errMsg);
sqlite3_free(sql); sql = NULL;
- free_nullsafe(glob_results);
+ free_nullsafe(ctx, glob_results);
return NULL;
}
@@ -430,7 +430,7 @@ dbresult *sqlite_query_mapped(eurephiaCTX *ctx, SQLqueryType qType, const char *
sqlstub, (strlen_nullsafe(tmp1) > 0 ? "WHERE" : ""), tmp1,
sortkeys);
}
- free_nullsafe(tmp1);
+ free_nullsafe(ctx, tmp1);
}
break;
@@ -440,15 +440,15 @@ dbresult *sqlite_query_mapped(eurephiaCTX *ctx, SQLqueryType qType, const char *
tmp2 = _build_sqlpart(btWHERE, whereMap);
res = sqlite_query(ctx, "%s SET %s WHERE %s", sqlstub, tmp1, tmp2);
- free_nullsafe(tmp1);
- free_nullsafe(tmp2);
+ free_nullsafe(ctx, tmp1);
+ free_nullsafe(ctx, tmp2);
}
break;
case SQL_INSERT:
tmp1 = _build_sqlpart(btINSERT, valMap);
res = sqlite_query(ctx, "%s %s", sqlstub, tmp1);
- free_nullsafe(tmp1);
+ free_nullsafe(ctx, tmp1);
break;
}
@@ -536,8 +536,8 @@ xmlNodePtr sqlite_xml_value(xmlNodePtr node, xmlFieldType xmltyp, char *inname,
retnode = NULL;
}
}
- free_nullsafe(data);
- free_nullsafe(name);
+ free_nullsafe(NULL, data);
+ free_nullsafe(NULL, name);
return retnode;
}
#endif
generated by cgit (git 2.34.1) at 2025-05-21 05:37:10 +0000