From 8214bb51bea5205dd915fd8e41cabdf9e02e978a Mon Sep 17 00:00:00 2001 From: Daniel Markstedt Date: Fri, 7 Nov 2025 07:37:54 +0100 Subject: [PATCH] libatalk: Simplify error logging on parameter error in cnid_mysql_find() Don't log structure values in the case of parameter error to avoid the risk of accessing uninitialized value Besides, the name is logged in an a log entry just before this --- libatalk/cnid/mysql/cnid_mysql.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libatalk/cnid/mysql/cnid_mysql.c b/libatalk/cnid/mysql/cnid_mysql.c index ad5e0117338..65122135bf0 100644 --- a/libatalk/cnid/mysql/cnid_mysql.c +++ b/libatalk/cnid/mysql/cnid_mysql.c @@ -815,7 +815,7 @@ int cnid_mysql_find(struct _cnid_db *cdb, const char *name, size_t namelen, void *buffer, size_t buflen) { EC_INIT; - CNID_mysql_private *db; + CNID_mysql_private *db = cdb->cnid_db_private; char *sql = NULL; char *namelike = NULL; MYSQL_RES *result = NULL; @@ -827,9 +827,8 @@ int cnid_mysql_find(struct _cnid_db *cdb, const char *name, size_t namelen, "cnid_mysql_find: called with name='%s', namelen=%zu, buflen=%zu", name, namelen, buflen); - if (!cdb || !(db = cdb->cnid_db_private) || !name) { - LOG(log_error, logtype_cnid, - "cnid_mysql_find: Parameter error (cdb=%p, db=%p, name=%p)", cdb, db, name); + if (!cdb || !db || !name) { + LOG(log_error, logtype_cnid, "cnid_mysql_find: Parameter error"); errno = CNID_ERR_PARAM; EC_FAIL; }