Don't set resource pointers to NULL when the handle is freed (in SQL drivers)

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c b/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c
index 8778f338c20c75d3c39c63d0ecc15fb0fb87a462..1d119651daf231dbd275bee8d8ac75c35ed33e09 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c
@@ -54,9 +54,7 @@ static int _sql_socket_destructor(rlm_sql_db2_conn_t *conn)
                SQLFreeHandle(SQL_HANDLE_DBC, conn->hdbc);
        }
 
-       if (conn->henv) {
-               SQLFreeHandle(SQL_HANDLE_ENV, conn->henv);
-       }
+       if (conn->henv) SQLFreeHandle(SQL_HANDLE_ENV, conn->henv);
 
        return RLM_SQL_OK;
 }

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c b/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c
index d04601a958f4348e13102ee4186991f759256324..7a811bb593f91dacc730ee752a15141ae3eb753e 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c
@@ -52,9 +52,7 @@ static int _sql_socket_destructor(rlm_sql_firebird_conn_t *conn)
        pthread_mutex_destroy (&conn->mut);
 #endif
 
-       for (i=0; i < conn->row_fcount; i++) {
-               free(conn->row[i]);
-       }
+       for (i = 0; i < conn->row_fcount; i++) free(conn->row[i]);
 
        free(conn->row);
        free(conn->row_sizes);

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/rlm_sql_iodbc.c b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/rlm_sql_iodbc.c
index 61d20868e57225ae516fd7a926c73258851f11f4..682b2404636cecfc3eb76529d231c8706840f1ff 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/rlm_sql_iodbc.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/rlm_sql_iodbc.c
@@ -58,18 +58,14 @@ static int _sql_socket_destructor(rlm_sql_iodbc_conn_t *conn)
 {
        DEBUG2("rlm_sql_iodbc: Socket destructor called, closing socket");
 
-       if (conn->stmt) {
-               SQLFreeStmt(conn->stmt, SQL_DROP);
-       }
+       if (conn->stmt) SQLFreeStmt(conn->stmt, SQL_DROP);
 
        if (conn->dbc_handle) {
                SQLDisconnect(conn->dbc_handle);
                SQLFreeConnect(conn->dbc_handle);
        }
 
-       if (conn->env_handle) {
-               SQLFreeEnv(conn->env_handle);
-       }
+       if (conn->env_handle) SQLFreeEnv(conn->env_handle);
 
        return 0;
 }

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
index a3b68215d93cd5a71ca6a65514bfbdb72eb4a7ec..3991fd0d2e4084d15beb2ebdc4bca6396f70edd7 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
@@ -120,11 +120,7 @@ static int _sql_socket_destructor(rlm_sql_mysql_conn_t *conn)
 
 static int _mod_destructor(UNUSED rlm_sql_mysql_config_t *driver)
 {
-       mysql_instance_count--;
-
-       if (mysql_instance_count == 0) {
-                mysql_library_end();
-       }
+       if (--mysql_instance_count == 0) mysql_library_end();
 
        return 0;
 }

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c b/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
index 9470c5b83338da8d0db2a6556e790c0fe3fd64f0..d79fb72466ec6b8a3ebd62d51c4d8bc4c8db24e1 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
@@ -129,21 +129,10 @@ unknown:
 
 static int _sql_socket_destructor(rlm_sql_oracle_conn_t *conn)
 {
-       if (conn->ctx) {
-               OCILogoff(conn->ctx, conn->error);
-       }
-
-       if (conn->query) {
-               OCIHandleFree((dvoid *)conn->query, OCI_HTYPE_STMT);
-       }
-
-       if (conn->error) {
-               OCIHandleFree((dvoid *)conn->error, OCI_HTYPE_ERROR);
-       }
-
-       if (conn->env) {
-               OCIHandleFree((dvoid *)conn->env, OCI_HTYPE_ENV);
-       }
+       if (conn->ctx) OCILogoff(conn->ctx, conn->error);
+       if (conn->query) OCIHandleFree((dvoid *)conn->query, OCI_HTYPE_STMT);
+       if (conn->error) OCIHandleFree((dvoid *)conn->error, OCI_HTYPE_ERROR);
+       if (conn->env) OCIHandleFree((dvoid *)conn->env, OCI_HTYPE_ENV);
 
        return 0;
 }

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
index ef693c265c18967729f9c3f002e9476c7357be1f..bbb91c569b4d368ac5905feb912ebfbe002ad8ae 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
@@ -221,13 +221,10 @@ static int _sql_socket_destructor(rlm_sql_postgres_conn_t *conn)
 {
        DEBUG2("rlm_sql_postgresql: Socket destructor called, closing socket");
 
-       if (!conn->db) {
-               return 0;
-       }
+       if (!conn->db) return 0;
 
        /* PQfinish also frees the memory used by the PGconn structure */
        PQfinish(conn->db);
-       conn->db = NULL;
 
        return 0;
 }

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
index 3cf37dc3f630f364e64030e69a3c5e196aeda2d8..98ec96cc7c38940ffb40663ad80c7030e7688778 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
@@ -368,9 +368,7 @@ static int _sql_socket_destructor(rlm_sql_sqlite_conn_t *conn)
 
        if (conn->db) {
                status = sqlite3_close(conn->db);
-               if (status != SQLITE_OK) {
-                       WARN("rlm_sql_sqlite: Got SQLite error code (%u) when closing socket", status);
-               }
+               if (status != SQLITE_OK) WARN("rlm_sql_sqlite: Got SQLite error code (%u) when closing socket", status);
        }
 
        return 0;

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c
index 7d311b1bff991aa596e3c66a0cae5ffc2eb704d6..c940c204120cf6f466c8e5fb5f482298dc6aab6f 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c
@@ -49,21 +49,14 @@ static int _sql_socket_destructor(rlm_sql_unixodbc_conn_t *conn)
 {
        DEBUG2("rlm_sql_unixodbc: Socket destructor called, closing socket");
 
-       if (conn->stmt) {
-               SQLFreeStmt(conn->stmt, SQL_DROP);
-               conn->stmt = NULL;
-       }
+       if (conn->stmt) SQLFreeStmt(conn->stmt, SQL_DROP);
 
        if (conn->dbc) {
                SQLDisconnect(conn->dbc);
                SQLFreeConnect(conn->dbc);
-               conn->dbc = NULL;
        }
 
-       if (conn->env) {
-               SQLFreeEnv(conn->env);
-               conn->env = NULL;
-       }
+       if (conn->env) SQLFreeEnv(conn->env);
 
        return 0;
 }