archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed bug #64511 - pdo_dblib segfaults or leaks on nextRowset()

Browse source
This commit is contained in:
Stanley Sufficool 2014-10-22 20:13:22 -07:00
parent fe8577efb1
commit 83144a7281
1 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ext/pdo_dblib/dblib_stmt.c
View file

@ -103,21 +103,15 @@ static int pdo_dblib_stmt_cursor_closer(pdo_stmt_t *stmt TSRMLS_DC)
/* Cancel any pending results */ /* Cancel any pending results */
dbcancel(H->link); dbcancel(H->link);
efree(stmt->columns);
stmt->columns = NULL;
return 1; return 1;
} }
static int pdo_dblib_stmt_dtor(pdo_stmt_t *stmt TSRMLS_DC) static int pdo_dblib_stmt_dtor(pdo_stmt_t *stmt TSRMLS_DC)
{ {
pdo_dblib_stmt *S = (pdo_dblib_stmt*)stmt->driver_data; pdo_dblib_stmt *S = (pdo_dblib_stmt*)stmt->driver_data;
efree(stmt->columns);
stmt->columns = NULL;
efree(S); efree(S);
return 1; return 1;
} }
@ -128,16 +122,16 @@ static int pdo_dblib_stmt_next_rowset(pdo_stmt_t *stmt TSRMLS_DC)
RETCODE ret; RETCODE ret;
ret = dbresults(H->link); ret = dbresults(H->link);
if (FAIL == ret) { if (FAIL == ret) {
pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "PDO_DBLIB: dbresults() returned FAIL" TSRMLS_CC); pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "PDO_DBLIB: dbresults() returned FAIL" TSRMLS_CC);
return 0; return 0;
} }
if(NO_MORE_RESULTS == ret) { if(NO_MORE_RESULTS == ret) {
return 0; return 0;
} }
stmt->row_count = DBCOUNT(H->link); stmt->row_count = DBCOUNT(H->link);
stmt->column_count = dbnumcols(H->link); stmt->column_count = dbnumcols(H->link);
@ -204,7 +198,7 @@ static int pdo_dblib_stmt_describe(pdo_stmt_t *stmt, int colno TSRMLS_DC)
struct pdo_column_data *col = &stmt->columns[colno]; struct pdo_column_data *col = &stmt->columns[colno];
col->name = (char*)dbcolname(H->link, colno+1); col->name = estrdup(dbcolname(H->link, colno+1));
col->maxlen = dbcollen(H->link, colno+1); col->maxlen = dbcollen(H->link, colno+1);
col->namelen = strlen(col->name); col->namelen = strlen(col->name);
col->param_type = PDO_PARAM_STR; col->param_type = PDO_PARAM_STR;