From f7b9c12ed91461c18c6de6f5c75e998625f8de76 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 13 Mar 2014 10:28:04 +0100 Subject: [PATCH 1/3] updated libs_version.txt --- win32/build/libs_version.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32/build/libs_version.txt b/win32/build/libs_version.txt index 964a2c735f..b4fbfbc0e6 100644 --- a/win32/build/libs_version.txt +++ b/win32/build/libs_version.txt @@ -2,12 +2,12 @@ bz2-1.0.6 cclient-2007f freetype-2.4.10 icu-51.2 -jpeglib-9 +jpeglib-9a libcurl-7.35.0 libiconv-1.14 libmcrypt-2.5.8 libmpir-2.6.0 -libpng-1.5.14 +libpng-1.5.18 libpq-9.2.2 libssh2-1.4.3 libtidy-20090406 From be0563b5b0950d6f1044fd3ff7b9f9e0af8f5800 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 13 Mar 2014 10:50:30 +0100 Subject: [PATCH 2/3] fix macro --- ext/oci8/oci8_statement.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/oci8/oci8_statement.c b/ext/oci8/oci8_statement.c index 8c1b2f42b8..0b0ae05721 100644 --- a/ext/oci8/oci8_statement.c +++ b/ext/oci8/oci8_statement.c @@ -1217,7 +1217,7 @@ int php_oci_bind_by_name(php_oci_statement *statement, char *name, php_size_t na return 1; } convert_to_boolean(var); - bind_data = (int *)&Z_LVAL_P(var); + bind_data = (int *)&Z_IVAL_P(var); value_sz = sizeof(int); mode = OCI_DEFAULT; From 65fcde66515db91bfa4b2e89f15a888e684fcdf2 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 13 Mar 2014 11:02:05 +0100 Subject: [PATCH 3/3] fix array types for pass by ref --- ext/interbase/ibase_events.c | 6 +++--- ext/interbase/interbase.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ext/interbase/ibase_events.c b/ext/interbase/ibase_events.c index 6212f71b90..fa47189b36 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 7bb0ade50b..52047ce8b0 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; }