From: Nuno Lopes <nlopess@php.net>
Date: Sat, 29 Sep 2007 11:18:42 +0000 (+0000)
Subject: fix a few compiler warnings (mostly use of unitialized values)
X-Git-Tag: BEFORE_IMPORT_OF_MYSQLND_IN_5_3~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e029a0ee59eb6857517e56a357c3f3f269f546ea;p=php

fix a few compiler warnings (mostly use of unitialized values)
---

diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 842b9e547d..3e276c4f97 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -490,8 +490,8 @@ static inline int php_openssl_enable_crypto(php_stream *stream,
 										zend_list_insert(mycert,
 											php_openssl_get_x509_list_id()));
 								add_next_index_zval(arr, zcert);
-							}
 								efree(zcert);
+							}
 
 						} else {
 							ZVAL_NULL(arr);
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 934dfb4514..4802fd5a8e 100644
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.12.1 on Mon Aug  6 21:32:14 2007 */
+/* Generated by re2c 0.12.0 on Sat Sep 29 11:44:15 2007 */
 #line 1 "ext/standard/var_unserializer.re"
 /*
   +----------------------------------------------------------------------+
@@ -334,7 +334,7 @@ static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
 	(*p) += 2;
 
 	if (datalen < 0 || (*p) + datalen >= max) {
-		zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, max - (*p));
+		zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, (long)(max - (*p)));
 		return 0;
 	}
 
diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
index a54da2ec67..bb8eefea01 100644
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -338,7 +338,7 @@ static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
 	(*p) += 2;
 
 	if (datalen < 0 || (*p) + datalen >= max) {
-		zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, max - (*p));
+		zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, (long)(max - (*p)));
 		return 0;
 	}
 
diff --git a/main/php_variables.c b/main/php_variables.c
index ef6aa36693..bf52dae0e8 100644
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -130,11 +130,12 @@ PHPAPI void php_register_variable_ex(char *var, zval *val, zval *track_vars_arra
 
 				if (track_vars_array) {
 					ht = Z_ARRVAL_P(track_vars_array);
+					zend_hash_del(ht, var, var_len + 1);
 				} else if (PG(register_globals)) {
 					ht = EG(active_symbol_table);
+					zend_hash_del(ht, var, var_len + 1);
 				}
 
-				zend_hash_del(ht, var, var_len + 1);
 				zval_dtor(val);
 
 				/* do not output the error message to the screen,
diff --git a/sapi/cli/php_cli_readline.c b/sapi/cli/php_cli_readline.c
index fffc6d07f3..67e3af5974 100644
--- a/sapi/cli/php_cli_readline.c
+++ b/sapi/cli/php_cli_readline.c
@@ -362,7 +362,7 @@ TODO:
 
 - future: respect scope ("php > function foo() { $[tab]" should only expand to local variables...)
 */
-	char *retval;
+	char *retval = NULL;
 	int textlen = strlen(text);
 	TSRMLS_FETCH();