]> granicus.if.org Git - php/commitdiff
fix arguments-by-ref with 5.x (problem appeared after the last 4.x compat patch)
authorAntony Dovgal <tony2001@php.net>
Sun, 25 Sep 2005 18:24:52 +0000 (18:24 +0000)
committerAntony Dovgal <tony2001@php.net>
Sun, 25 Sep 2005 18:24:52 +0000 (18:24 +0000)
make sure username_len is always initialized

ext/oci8/oci8.c

index 40bed0116d94335eae42a93af74740fe83e191c1..4ae76e30ffcc861c37433ea3f99c3eb070354213 100644 (file)
@@ -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;