andrey Wed, 10 Nov 2010 13:57:09 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=305244
Log:
Fix bad types, because zend_parse_xxx expect signed integers
for lengths, no matter how stupid this is :)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_report.c
U php/php-src/trunk/ext/mysqli/mysqli_api.c
U php/php-src/trunk/ext/mysqli/mysqli_nonapi.c
U php/php-src/trunk/ext/mysqli/mysqli_report.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c 2010-11-10
12:49:04 UTC (rev 305243)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c 2010-11-10
13:57:09 UTC (rev 305244)
@@ -1763,7 +1763,7 @@
MY_MYSQL *mysql;
MY_STMT *stmt;
char *query = NULL;
- unsigned int query_len;
+ int query_len;
zval *mysql_link;
MYSQLI_RESOURCE *mysqli_resource;
@@ -1847,10 +1847,10 @@
Binary-safe version of mysql_query() */
PHP_FUNCTION(mysqli_real_query)
{
- MY_MYSQL *mysql;
- zval *mysql_link;
- char *query = NULL;
- unsigned int query_len;
+ MY_MYSQL *mysql;
+ zval *mysql_link;
+ char *query = NULL;
+ int query_len;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"Os", &mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) {
return;
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c 2010-11-10
12:49:04 UTC (rev 305243)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_nonapi.c 2010-11-10
13:57:09 UTC (rev 305244)
@@ -62,7 +62,7 @@
MYSQLI_RESOURCE *mysqli_resource = NULL;
zval *object = getThis();
char *hostname = NULL, *username=NULL,
*passwd=NULL, *dbname=NULL, *socket=NULL;
- unsigned int hostname_len = 0, username_len = 0, passwd_len
= 0, dbname_len = 0, socket_len = 0;
+ int hostname_len = 0, username_len
= 0, passwd_len = 0, dbname_len = 0, socket_len = 0;
zend_bool persistent = FALSE;
long port = 0, flags = 0;
uint hash_len;
@@ -362,9 +362,9 @@
#if defined(MYSQLI_USE_MYSQLND)
PHP_FUNCTION(mysqli_fetch_all)
{
- MYSQL_RES *result;
- zval *mysql_result;
- long mode = MYSQLND_FETCH_NUM;
+ MYSQL_RES *result;
+ zval *mysql_result;
+ long mode = MYSQLND_FETCH_NUM;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"O|l", &mysql_result, mysqli_result_class_entry, &mode) == FAILURE) {
return;
@@ -437,10 +437,10 @@
allows to execute multiple queries */
PHP_FUNCTION(mysqli_multi_query)
{
- MY_MYSQL *mysql;
- zval *mysql_link;
- char *query = NULL;
- unsigned int query_len;
+ MY_MYSQL *mysql;
+ zval *mysql_link;
+ char *query = NULL;
+ int query_len;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"Os", &mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) {
return;
@@ -485,8 +485,8 @@
MYSQLI_RESOURCE *mysqli_resource;
MYSQL_RES *result;
char *query = NULL;
- unsigned int query_len;
- unsigned long resultmode = MYSQLI_STORE_RESULT;
+ int query_len;
+ 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;
@@ -873,10 +873,10 @@
sets client character set */
PHP_FUNCTION(mysqli_set_charset)
{
- MY_MYSQL *mysql;
- zval *mysql_link;
- char *cs_name;
- int csname_len;
+ MY_MYSQL *mysql;
+ zval *mysql_link;
+ char *cs_name;
+ int csname_len;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"Os", &mysql_link, mysqli_link_class_entry, &cs_name, &csname_len) == FAILURE) {
return;
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_report.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_report.c 2010-11-10
12:49:04 UTC (rev 305243)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_report.c 2010-11-10
13:57:09 UTC (rev 305244)
@@ -33,7 +33,7 @@
sets report level */
PHP_FUNCTION(mysqli_report)
{
- long flags;
+ long flags;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &flags) ==
FAILURE) {
Modified: php/php-src/trunk/ext/mysqli/mysqli_api.c
===================================================================
--- php/php-src/trunk/ext/mysqli/mysqli_api.c 2010-11-10 12:49:04 UTC (rev
305243)
+++ php/php-src/trunk/ext/mysqli/mysqli_api.c 2010-11-10 13:57:09 UTC (rev
305244)
@@ -1763,7 +1763,7 @@
MY_MYSQL *mysql;
MY_STMT *stmt;
char *query = NULL;
- unsigned int query_len;
+ int query_len;
zval *mysql_link;
MYSQLI_RESOURCE *mysqli_resource;
@@ -1847,10 +1847,10 @@
Binary-safe version of mysql_query() */
PHP_FUNCTION(mysqli_real_query)
{
- MY_MYSQL *mysql;
- zval *mysql_link;
- char *query = NULL;
- unsigned int query_len;
+ MY_MYSQL *mysql;
+ zval *mysql_link;
+ char *query = NULL;
+ int query_len;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"Os", &mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) {
return;
Modified: php/php-src/trunk/ext/mysqli/mysqli_nonapi.c
===================================================================
--- php/php-src/trunk/ext/mysqli/mysqli_nonapi.c 2010-11-10 12:49:04 UTC
(rev 305243)
+++ php/php-src/trunk/ext/mysqli/mysqli_nonapi.c 2010-11-10 13:57:09 UTC
(rev 305244)
@@ -62,7 +62,7 @@
MYSQLI_RESOURCE *mysqli_resource = NULL;
zval *object = getThis();
char *hostname = NULL, *username=NULL,
*passwd=NULL, *dbname=NULL, *socket=NULL;
- unsigned int hostname_len = 0, username_len = 0, passwd_len
= 0, dbname_len = 0, socket_len = 0;
+ int hostname_len = 0, username_len
= 0, passwd_len = 0, dbname_len = 0, socket_len = 0;
zend_bool persistent = FALSE;
long port = 0, flags = 0;
uint hash_len;
@@ -362,9 +362,9 @@
#if defined(MYSQLI_USE_MYSQLND)
PHP_FUNCTION(mysqli_fetch_all)
{
- MYSQL_RES *result;
- zval *mysql_result;
- long mode = MYSQLND_FETCH_NUM;
+ MYSQL_RES *result;
+ zval *mysql_result;
+ long mode = MYSQLND_FETCH_NUM;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"O|l", &mysql_result, mysqli_result_class_entry, &mode) == FAILURE) {
return;
@@ -425,10 +425,10 @@
allows to execute multiple queries */
PHP_FUNCTION(mysqli_multi_query)
{
- MY_MYSQL *mysql;
- zval *mysql_link;
- char *query = NULL;
- unsigned int query_len;
+ MY_MYSQL *mysql;
+ zval *mysql_link;
+ char *query = NULL;
+ int query_len;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"Os", &mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) {
return;
@@ -473,8 +473,8 @@
MYSQLI_RESOURCE *mysqli_resource;
MYSQL_RES *result;
char *query = NULL;
- unsigned int query_len;
- unsigned long resultmode = MYSQLI_STORE_RESULT;
+ int query_len;
+ 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;
@@ -861,10 +861,10 @@
sets client character set */
PHP_FUNCTION(mysqli_set_charset)
{
- MY_MYSQL *mysql;
- zval *mysql_link;
- char *cs_name;
- int csname_len;
+ MY_MYSQL *mysql;
+ zval *mysql_link;
+ char *cs_name;
+ int csname_len;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"Os", &mysql_link, mysqli_link_class_entry, &cs_name, &csname_len) == FAILURE) {
return;
Modified: php/php-src/trunk/ext/mysqli/mysqli_report.c
===================================================================
--- php/php-src/trunk/ext/mysqli/mysqli_report.c 2010-11-10 12:49:04 UTC
(rev 305243)
+++ php/php-src/trunk/ext/mysqli/mysqli_report.c 2010-11-10 13:57:09 UTC
(rev 305244)
@@ -33,7 +33,7 @@
sets report level */
PHP_FUNCTION(mysqli_report)
{
- long flags;
+ long flags;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &flags) ==
FAILURE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
