MFH: fix bug #33214 (odbc_next_result does not signal SQL errors with 2-statement SQL batches).

tony2001 · tony2001 · commit 473e88e57418 · 2005-06-02T15:42:58.000Z
Path by rich at kastle dot com.
diff --git a/NEWS b/NEWS
@@ -8,6 +8,8 @@ PHP 4                                                                      NEWS
 - Changed sha1_file() and md5_file() functions to use streams instead of 
   low level IO. (Uwe)
 - Fixed memory corruption in stristr(). (Derick)
+- Fixed bug #33214 (odbc_next_result does not signal SQL errors with 
+  2-statement SQL batches). (rich at kastle dot com, Tony)
 - Fixed bug #33210 (relax jpeg recursive loop protection). (Ilia)
 - Fixed bug #33200 (preg_replace(): magic_quotes_sybase=On makes 'e' modifier
   misbehave). (Jani)
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
@@ -2436,8 +2436,10 @@ PHP_FUNCTION(odbc_next_result)
 			result->values = NULL;
 		}
 		RETURN_TRUE;
-	}
-	else {
+	} else if (rc == SQL_NO_DATA_FOUND) {
+		RETURN_FALSE;
+	} else {
+		odbc_sql_error(result->conn_ptr, result->stmt, "SQLMoreResults");
 		RETURN_FALSE;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -2436,8 +2436,10 @@ PHP_FUNCTION(odbc_next_result)`
`2436`	`2436`	`result->values = NULL;`
`2437`	`2437`	`}`
`2438`	`2438`	`RETURN_TRUE;`
`2439`		`- }`
`2440`		`- else {`
	`2439`	`+ } else if (rc == SQL_NO_DATA_FOUND) {`
	`2440`	`+ RETURN_FALSE;`
	`2441`	`+ } else {`
	`2442`	`+ odbc_sql_error(result->conn_ptr, result->stmt, "SQLMoreResults");`
`2441`	`2443`	`RETURN_FALSE;`
`2442`	`2444`	`}`
`2443`	`2445`	`}`