From: Christopher Jones <sixd@php.net>
Date: Wed, 10 Nov 2010 18:49:55 +0000 (+0000)
Subject: Fixed bug #53284 (Valgrind warnings in oci_set_* functions)
X-Git-Tag: php-5.4.0alpha1~191^2~705
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b2b1a530315b80a62258418971323bd76bef52ad;p=php

Fixed bug #53284 (Valgrind warnings in oci_set_* functions)
---

diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c
index 2f01f27e22..b9e79f9fe9 100644
--- a/ext/oci8/oci8_interface.c
+++ b/ext/oci8/oci8_interface.c
@@ -1715,7 +1715,7 @@ PHP_FUNCTION(oci_set_client_identifier)
 	zval *z_connection;
 	php_oci_connection *connection;
 	char *client_id;
-	long client_id_len;
+	int client_id_len;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_connection, &client_id, &client_id_len) == FAILURE) {
 		return;
@@ -1740,7 +1740,7 @@ PHP_FUNCTION(oci_set_edition)
 {
 #if ((OCI_MAJOR_VERSION > 11) || ((OCI_MAJOR_VERSION == 11) && (OCI_MINOR_VERSION >= 2)))
 	char *edition;
-	long edition_len;
+	int edition_len;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &edition, &edition_len) == FAILURE) {
 		return;
@@ -1773,7 +1773,7 @@ PHP_FUNCTION(oci_set_module_name)
 	zval *z_connection;
 	php_oci_connection *connection;
 	char *module;
-	long module_len;
+	int module_len;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_connection, &module, &module_len) == FAILURE) {
 		return;
@@ -1804,7 +1804,7 @@ PHP_FUNCTION(oci_set_action)
 	zval *z_connection;
 	php_oci_connection *connection;
 	char *action;
-	long action_len;
+	int action_len;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_connection, &action, &action_len) == FAILURE) {
 		return;
@@ -1835,7 +1835,7 @@ PHP_FUNCTION(oci_set_client_info)
 	zval *z_connection;
 	php_oci_connection *connection;
 	char *client_info;
-	long client_info_len;
+	int client_info_len;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs", &z_connection, &client_info, &client_info_len) == FAILURE) {
 		return;