MFB: fix compiler warnings

diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 768f49758d1e5a3cf04fb48a5f2f57e546363759..9595a0304fc770f4c26fda58fcfff12b6bb94189 100644 (file)
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -464,7 +464,7 @@ static inline int php_openssl_enable_crypto(php_stream *stream,
                                                                "ssl", "peer_certificate",
                                                                zcert);
                                                peer_cert = NULL;
-                                               efree(zcert);
+                                               FREE_ZVAL(zcert);
                                        }
 
                                        if (SUCCESS == php_stream_context_get_option(
@@ -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);
+                                                               FREE_ZVAL(zcert);
                                                        }
-                                                       efree(zcert);
                                                } else {
                                                        ZVAL_NULL(arr);
                                                }

diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 6784a155546baace9d490486e5e205d74d9daf8c..a5300878fe470cb2f3cc6a0c13924cdbdd62c7e2 100644 (file)
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -388,7 +388,7 @@ static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
        }
 
        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 ea53001febc8f77ebd331fe6265cfc93e243877d..0aca9a657aea65a3dcb22b9e2aaa779eeac6f399 100644 (file)
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -392,7 +392,7 @@ static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
        }
 
        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/sapi/cli/php_cli_readline.c b/sapi/cli/php_cli_readline.c
index d1e344f47d086fca6c29652a46ba0d8f7c02cfaa..ff790169840aa6316b0aff836d00601cc0f9167a 100644 (file)
--- a/sapi/cli/php_cli_readline.c
+++ b/sapi/cli/php_cli_readline.c
@@ -423,7 +423,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();