com php-src: fix array types for pass by ref: ext/interbase/iba se_events.c ext/interbase/interbase.c
| From: | Anatol Belski | Date: | Thu, 13 Mar 2014 10:02:05 +0000 |
| Subject: | com php-src: fix array types for pass by ref: ext/interbase/iba se_events.c ext/interbase/interbase.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76482@lists.php.net to get a copy of this message | ||
Commit: 65fcde66515db91bfa4b2e89f15a888e684fcdf2
Author: Anatol Belski <ab@php.net> Thu, 13 Mar 2014 11:02:05 +0100
Parents: be0563b5b0950d6f1044fd3ff7b9f9e0af8f5800
Branches: str_size_and_int64_56_backport
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=65fcde66515db91bfa4b2e89f15a888e684fcdf2
Log:
fix array types for pass by ref
Changed paths:
M ext/interbase/ibase_events.c
M ext/interbase/interbase.c
Diff:
diff --git a/ext/interbase/ibase_events.c b/ext/interbase/ibase_events.c
index 6212f71..fa47189 100644
--- a/ext/interbase/ibase_events.c
+++ b/ext/interbase/ibase_events.c
@@ -93,7 +93,7 @@ static void _php_ibase_event_block(ibase_db_link *ib_link, unsigned short count,
char **events, unsigned short *l, char **event_buf, char **result_buf)
{
ISC_STATUS dummy_result[20];
- php_uint_t dummy_count[15];
+ ISC_ULONG dummy_count[15];
/**
* Unfortunately, there's no clean and portable way in C to pass arguments to
@@ -131,7 +131,7 @@ PHP_FUNCTION(ibase_wait_event)
int num_args;
char *event_buffer, *result_buffer, *events[15];
unsigned short i = 0, event_count = 0, buffer_size;
- php_uint_t occurred_event[15];
+ ISC_ULONG occurred_event[15];
RESET_ERRMSG;
@@ -209,7 +209,7 @@ static isc_callback _php_ibase_callback(ibase_event *event, /* {{{ */
*/
switch (event->state) {
unsigned short i;
- php_uint_t occurred_event[15];
+ ISC_ULONG occurred_event[15];
zval event_name, link_id, return_value, *args[2];
default: /* == DEAD */
diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index 7bb0ade..52047ce 100644
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -897,6 +897,7 @@ static void _php_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) /*
char *c, hash[16], *args[] = { NULL, NULL, NULL, NULL, NULL };
int i;
php_size_t len[] = { 0, 0, 0, 0, 0 };
+ int ilen[] = { 0, 0, 0, 0, 0 };
php_int_t largs[] = { 0, 0, 0 };
PHP_MD5_CTX hash_context;
zend_rsrc_list_entry new_index_ptr, *le;
@@ -929,7 +930,7 @@ static void _php_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) /*
args[CSET] = c;
len[CSET] = strlen(c);
}
-
+
/* don't want usernames and passwords floating around */
PHP_MD5Init(&hash_context);
for (i = 0; i < sizeof(args)/sizeof(char*); ++i) {
@@ -988,8 +989,13 @@ static void _php_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) /*
RETURN_FALSE;
}
+ /* need to pass it by ref as int * */
+ for (i = 0; i < sizeof(len)/sizeof(php_size_t); i++) {
+ ilen[i] = (int)len[i];
+ }
+
/* create the ib_link */
- if (FAILURE == _php_ibase_attach_db(args, len, largs, &db_handle TSRMLS_CC)) {
+ if (FAILURE == _php_ibase_attach_db(args, ilen, largs, &db_handle TSRMLS_CC)) {
RETURN_FALSE;
}