tony2001                Thu Nov  8 13:29:06 2007 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/mysql  php_mysql.c 
  Log:
  MFH: plug leak on invalid result type
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.4&r2=1.213.2.6.2.16.2.5&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.4 
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.5
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.4    Mon Oct  8 16:14:56 2007
+++ php-src/ext/mysql/php_mysql.c       Thu Nov  8 13:29:06 2007
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
  
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.4 2007/10/08 16:14:56 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.5 2007/11/08 13:29:06 tony2001 Exp $ */
 
 /* TODO:
  *
@@ -2031,6 +2031,7 @@
 
        if ((result_type & MYSQL_BOTH) == 0) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "The result type 
should be either MYSQL_NUM, MYSQL_ASSOC or MYSQL_BOTH");
+               result_type = MYSQL_BOTH;
        }
        
        ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, result, -1, "MySQL 
result", le_result);

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

Reply via email to