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

[Andrey Hristov]

andrey          Sat Aug  6 12:56:11 2005 EDT

  Modified files:              (Branch: PHP_5_0)
    /php-src/ext/mysqli mysqli_nonapi.c 
  Log:
  - fix int-long issue on 64bit (MFH)
  - add data checking (MFH)
  - add a comment
  
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.34.2.10&r2=1.34.2.11&ty=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.34.2.10 
php-src/ext/mysqli/mysqli_nonapi.c:1.34.2.11
--- php-src/ext/mysqli/mysqli_nonapi.c:1.34.2.10        Mon Jun 27 14:20:25 2005
+++ php-src/ext/mysqli/mysqli_nonapi.c  Sat Aug  6 12:56:06 2005
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_nonapi.c,v 1.34.2.10 2005/06/27 18:20:25 tony2001 Exp $ 
+  $Id: mysqli_nonapi.c,v 1.34.2.11 2005/08/06 16:56:06 andrey Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -259,11 +259,20 @@
        MYSQL_RES                       *result;
        char                            *query = NULL;
        unsigned int            query_len;
-       unsigned int            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;
@@ -274,6 +283,7 @@
        }
 
        if (!mysql_field_count(mysql->mysql)) {
+               /* no result set - not a SELECT */
                if (MyG(report_mode) & MYSQLI_REPORT_INDEX) {
                        php_mysqli_report_index(query, 
mysql->mysql->server_status TSRMLS_CC);
                }

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