From 2c5f4c635a76a2b38971ccb31ac56b9266b79e4c Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 16 Jul 2011 13:22:57 +0200 Subject: [PATCH] db: fix Smatch warnings /home/laforge/projects/git/openbsc/openbsc/src/libmsc/db.c +254 db_fini(6) info: redundant null check on db_dirname calling free() /home/laforge/projects/git/openbsc/openbsc/src/libmsc/db.c +256 db_fini(8) info: redundant null check on db_basename calling free() /home/laforge/projects/git/openbsc/openbsc/src/libmsc/db.c +280 db_create_subscriber(20) warn: variable dereferenced before check 'subscr' --- openbsc/src/libmsc/db.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/openbsc/src/libmsc/db.c b/openbsc/src/libmsc/db.c index 1ddd3fdf4..126ce661f 100644 --- a/openbsc/src/libmsc/db.c +++ b/openbsc/src/libmsc/db.c @@ -250,10 +250,8 @@ int db_fini() dbi_conn_close(conn); dbi_shutdown(); - if (db_dirname) - free(db_dirname); - if (db_basename) - free(db_basename); + free(db_dirname); + free(db_basename); return 0; } @@ -276,9 +274,9 @@ struct gsm_subscriber *db_create_subscriber(struct gsm_network *net, char *imsi) } subscr = subscr_alloc(); - subscr->flags |= GSM_SUBSCRIBER_FIRST_CONTACT; if (!subscr) return NULL; + subscr->flags |= GSM_SUBSCRIBER_FIRST_CONTACT; result = dbi_conn_queryf(conn, "INSERT INTO Subscriber " "(imsi, created, updated) "