[PHP-CVS] cvs: php-src /ext/mysqli mysqli_nonapi.c

[Andrey Hristov]

andrey          Sat Aug  6 12:38:49 2005 EDT

  Modified files:              
    /php-src/ext/mysqli mysqli_nonapi.c 
  Log:
  add error checking
  
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.52&r2=1.53&ty=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.52 
php-src/ext/mysqli/mysqli_nonapi.c:1.53
--- php-src/ext/mysqli/mysqli_nonapi.c:1.52     Sat Aug  6 12:15:53 2005
+++ php-src/ext/mysqli/mysqli_nonapi.c  Sat Aug  6 12:38:48 2005
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_nonapi.c,v 1.52 2005/08/06 16:15:53 andrey Exp $ 
+  $Id: mysqli_nonapi.c,v 1.53 2005/08/06 16:38:48 andrey Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -213,11 +213,21 @@
        MYSQL_RES                       *result;
        char                            *query = NULL;
        unsigned int            query_len;
-       unsigned long           resultmode = 0;
+       unsigned long           resultmode = MYSQLI_STORE_RESULT;
 
        if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), 
"Os|l", &mysql_link, mysqli_link_class_entry, &query, &query_len, &resultmode) 
== FAILURE) {
                return;
        }
+
+       if (!query_len) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty query");
+               RETURN_FALSE;
+       }
+       if (resultmode != MYSQLI_USE_RESULT && resultmode != 
MYSQLI_STORE_RESULT) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid value for 
resultmode");
+               RETURN_FALSE;
+       }
+
        MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL*, &mysql_link, "mysqli_link");
 
        MYSQLI_DISABLE_MQ;

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