From d7fd614cc6149884bc29818d9467bc5bc269e81c Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 29 Feb 2016 15:38:42 +0100 Subject: [PATCH] fix leaks and add one more NULL check --- ext/pdo_dblib/dblib_stmt.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/ext/pdo_dblib/dblib_stmt.c b/ext/pdo_dblib/dblib_stmt.c index 387648244f..2830272b82 100644 --- a/ext/pdo_dblib/dblib_stmt.c +++ b/ext/pdo_dblib/dblib_stmt.c @@ -104,10 +104,16 @@ static int pdo_dblib_stmt_cursor_closer(pdo_stmt_t *stmt TSRMLS_DC) dbcancel(H->link); if (stmt->columns) { + int i = 0; + for (; i < stmt->column_count; i++) { + if (stmt->columns[i].name) { + efree(stmt->columns[i].name); + } + } efree(stmt->columns); stmt->columns = NULL; } - + return 1; } @@ -115,8 +121,16 @@ static int pdo_dblib_stmt_dtor(pdo_stmt_t *stmt TSRMLS_DC) { pdo_dblib_stmt *S = (pdo_dblib_stmt*)stmt->driver_data; - efree(stmt->columns); - stmt->columns = NULL; + if (stmt->columns) { + int i = 0; + for (; i < stmt->column_count; i++) { + if (stmt->columns[i].name) { + efree(stmt->columns[i].name); + } + } + efree(stmt->columns); + stmt->columns = NULL; + } efree(S); -- 2.40.0