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

Path by rich at kastle dot com.

diff --git a/NEWS b/NEWS
index 44fd1911a66042beaf76883f4f579c41ce081b04..00976483c35c99290028c5b67c4b3347f45b1dac 100644 (file)
--- 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
index a053e99f454e14fd724f9deb75cc0be5bc2ca0ae..cd25df9d46f10455af3b9abe2a435af439f8e0eb 100644 (file)
--- 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;
        }
 }