From: Wez Furlong <wez@php.net>
Date: Sat, 9 Jul 2005 05:01:14 +0000 (+0000)
Subject: don't free the cols until we know we have another rowset
X-Git-Tag: php-5.1.0b3~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f21084cb0beebe68e782ab6ef752df015a700413;p=php

don't free the cols until we know we have another rowset
---

diff --git a/ext/pdo_odbc/odbc_stmt.c b/ext/pdo_odbc/odbc_stmt.c
index 76a82c781a..0c6f77f459 100755
--- a/ext/pdo_odbc/odbc_stmt.c
+++ b/ext/pdo_odbc/odbc_stmt.c
@@ -489,8 +489,6 @@ static int odbc_stmt_next_rowset(pdo_stmt_t *stmt TSRMLS_DC)
 	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 @@ static int odbc_stmt_next_rowset(pdo_stmt_t *stmt TSRMLS_DC)
 		return 0;
 	}
 
+	free_cols(stmt, S TSRMLS_CC);
 	/* how many columns do we have ? */
 	SQLNumResultCols(S->stmt, &colcount);
 	stmt->column_count = (int)colcount;