[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_odbc odbc_driver.c

[Wez Furlong]

wez             Mon Sep 26 17:37:34 2005 EDT

  Modified files:              (Branch: PHP_5_1)
    /php-src/ext/pdo_odbc       odbc_driver.c 
  Log:
  ensure that this size is initialized correctly
  
  
http://cvs.php.net/diff.php/php-src/ext/pdo_odbc/odbc_driver.c?r1=1.27&r2=1.27.2.1&ty=u
Index: php-src/ext/pdo_odbc/odbc_driver.c
diff -u php-src/ext/pdo_odbc/odbc_driver.c:1.27 
php-src/ext/pdo_odbc/odbc_driver.c:1.27.2.1
--- php-src/ext/pdo_odbc/odbc_driver.c:1.27     Tue Jul 19 12:54:51 2005
+++ php-src/ext/pdo_odbc/odbc_driver.c  Mon Sep 26 17:37:33 2005
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: odbc_driver.c,v 1.27 2005/07/19 16:54:51 wez Exp $ */
+/* $Id: odbc_driver.c,v 1.27.2.1 2005/09/26 21:37:33 wez Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -59,7 +59,7 @@
 void pdo_odbc_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, PDO_ODBC_HSTMT 
statement, char *what, const char *file, int line TSRMLS_DC) /* {{{ */
 {
        RETCODE rc;
-       SWORD   errmsgsize;
+       SWORD   errmsgsize = 0;
        pdo_odbc_db_handle *H = (pdo_odbc_db_handle*)dbh->driver_data;
        pdo_odbc_errinfo *einfo = &H->einfo;
        pdo_odbc_stmt *S = NULL;
@@ -79,6 +79,10 @@
        rc = SQLError(H->env, H->dbc, statement, einfo->last_state, 
&einfo->last_error,
                        einfo->last_err_msg, sizeof(einfo->last_err_msg)-1, 
&errmsgsize);
 
+       if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
+               errmsgsize = 0;
+       }
+
        einfo->last_err_msg[errmsgsize] = '\0';
        einfo->file = file;
        einfo->line = line;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php