From dd0228d3d8dc2d1e3d106f6e9222342dd4a02777 Mon Sep 17 00:00:00 2001 From: foobar Date: Mon, 21 Apr 2003 17:53:37 +0000 Subject: [PATCH] Fix bug #23198 --- ext/oci8/oci8.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index 23409ca51a..318ceb8566 100644 --- 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; } -- 2.50.1