MFH: Fixed bug #23198

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 3b14052ff786fbb4c4b35f0b80cb547fdaa7b4c6..7905bd6134c88b413f6c4910bd8fe6f897269d09 100644 (file)
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -2154,7 +2154,7 @@ static oci_session *_oci_open_session(oci_server* server,char *username,char *pa
        OCISvcCtx *svchp = 0;
        char *hashed_details;
 #ifdef HAVE_OCI9
-       ub2 charsetid;
+       ub2 charsetid = 0;
 #endif
        TSRMLS_FETCH();
 
@@ -2218,9 +2218,10 @@ static oci_session *_oci_open_session(oci_server* server,char *username,char *pa
                                                        OCI(pEnv),
                                                        charset));
                
-               session->charsetId = charsetid;
                oci_debug("oci_do_connect: using charset id=%d",charsetid);
        }
+
+       session->charsetId = charsetid;
        
        /* create an environment using the character set id, Oracle 9i+ ONLY */
        CALL_OCI(OCIEnvNlsCreate(
@@ -2648,6 +2649,7 @@ static void oci_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent,int exclu
                username = Z_STRVAL_PP(userParam);
                password = Z_STRVAL_PP(passParam);
                dbname = Z_STRVAL_PP(dbParam);
+               charset = "";
        } else if (zend_get_parameters_ex(2, &userParam, &passParam) == SUCCESS) {
                convert_to_string_ex(userParam);
                convert_to_string_ex(passParam);
@@ -2655,6 +2657,7 @@ static void oci_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent,int exclu
                username = Z_STRVAL_PP(userParam);
                password = Z_STRVAL_PP(passParam);
                dbname = "";
+               charset = "";
        } else {
                WRONG_PARAM_COUNT;
        }