cvs: php-src /ext/pdo_odbc odbc_stmt.c

wez Sat Jul 9 01:01:15 2005 EDT Modified files: /php-src/ext/pdo_odbc odbc_stmt.c Log: don't free the cols until we know we have another rowset http://cvs.php.net/diff.php/php-src/ext/pdo_odbc/odbc_stmt.c?r1=1.22&r2=1.23&ty=u Index: php-src/ext/pdo_odbc/odbc_stmt.c diff -u php-src/ext/pdo_odbc/odbc_stmt.c:1.22 php-src/ext/pdo_odbc/odbc_stmt.c:1.23 --- php-src/ext/pdo_odbc/odbc_stmt.c:1.22 Thu Jul 7 10:20:04 2005 +++ php-src/ext/pdo_odbc/odbc_stmt.c Sat Jul 9 01:01:14 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: odbc_stmt.c,v 1.22 2005/07/07 14:20:04 wez Exp $ */ +/* $Id: odbc_stmt.c,v 1.23 2005/07/09 05:01:14 wez Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -489,8 +489,6 @@ SQLSMALLINT colcount; pdo_odbc_stmt *S = (pdo_odbc_stmt*)stmt->driver_data; - free_cols(stmt, S TSRMLS_CC); - /* NOTE: can't guarantee that output or input/output parameters * are set until this fella returns SQL_NO_DATA, according to * MSDN ODBC docs */ @@ -500,6 +498,7 @@ return 0; } + free_cols(stmt, S TSRMLS_CC); /* how many columns do we have ? */ SQLNumResultCols(S->stmt, &colcount); stmt->column_count = (int)colcount;