summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2005-09-25 18:24:52 +0000
committerAntony Dovgal <tony2001@php.net>2005-09-25 18:24:52 +0000
commit5ec597013ee32987816210cf997a88c3599fe8fd (patch)
tree0182477cd07770b7aae3ca94ed3b972e31dcd4ee
parenta2cbf800026a5c245e8754b4e06e8a8435382c48 (diff)
downloadphp-git-5ec597013ee32987816210cf997a88c3599fe8fd.tar.gz
fix arguments-by-ref with 5.x (problem appeared after the last 4.x compat patch)
make sure username_len is always initialized
-rw-r--r--ext/oci8/oci8.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 40bed0116d..4ae76e30ff 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -102,7 +102,7 @@ ZEND_GET_MODULE(oci8)
#ifdef ZEND_ENGINE_2
ZEND_BEGIN_ARG_INFO(oci_second_arg_force_ref, 0)
ZEND_ARG_PASS_INFO(0)
- ZEND_ARG_PASS_INFO(0)
+ ZEND_ARG_PASS_INFO(1)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(oci_third_arg_force_ref, 0)
ZEND_ARG_PASS_INFO(0)
@@ -864,7 +864,7 @@ void php_oci_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent, int exclus
php_oci_connection *connection;
char *username, *password;
char *dbname = NULL, *charset = NULL;
- long username_len, password_len;
+ long username_len = 0, password_len = 0;
long dbname_len = 0, charset_len = 0;
long session_mode = OCI_DEFAULT;