tony2001 Mon Feb 19 20:22:39 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/odbc php_odbc.c
Log:
MFH: check SQLError() return value and output a meaningful errmsg when it
fails
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.189.2.4.2.4&r2=1.189.2.4.2.5&diff_format=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.189.2.4.2.4
php-src/ext/odbc/php_odbc.c:1.189.2.4.2.5
--- php-src/ext/odbc/php_odbc.c:1.189.2.4.2.4 Tue Jan 16 18:56:06 2007
+++ php-src/ext/odbc/php_odbc.c Mon Feb 19 20:22:38 2007
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.189.2.4.2.4 2007/01/16 18:56:06 iliaa Exp $ */
+/* $Id: php_odbc.c,v 1.189.2.4.2.5 2007/02/19 20:22:38 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -587,6 +587,10 @@
do {
*/
rc = SQLError(henv, conn, stmt, state, &error, errormsg,
sizeof(errormsg)-1, &errormsgsize);
+ if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
+ sprintf(state, "HY000");
+ sprintf(errormsg, "Failed to fetch error message");
+ }
if (conn_resource) {
memcpy(conn_resource->laststate, state, sizeof(state));
memcpy(conn_resource->lasterrormsg, errormsg, sizeof(errormsg));
@@ -1224,7 +1228,7 @@
if (rc != SQL_SUCCESS) {
/* ummm.... he did it */
- odbc_sql_error(conn, NULL, "SQLDataSources");
+ odbc_sql_error(conn, SQL_NULL_HSTMT, "SQLDataSources");
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
