#include "php_variables.h"
#include "ext/spl/spl_array.h"
-#ifdef PHP_HTTP_HAVE_ICONV
+#if PHP_HTTP_HAVE_ICONV
# ifndef HAVE_ICONV
# define HAVE_ICONV 1
# endif
}
}
-#ifdef PHP_HTTP_HAVE_ICONV
+#if PHP_HTTP_HAVE_ICONV
ZEND_RESULT_CODE php_http_querystring_xlate(zval *dst, zval *src, const char *ie, const char *oe)
{
zval *entry;
zval *zvalue;
if ((zvalue = zend_hash_str_find(Z_ARRVAL_P(val), ZEND_STRL("value")))) {
- zval tmp;
+ zval tmp = {0};
ZVAL_COPY(&tmp, zvalue);
zval_dtor(val);
/*
* update
*/
- zval equal, tmp, *entry = &tmp;
+ zval equal, tmp, *entry = NULL;
ZVAL_UNDEF(&tmp);
/* recursive */
if (Z_TYPE_P(params_entry) == IS_ARRAY || Z_TYPE_P(params_entry) == IS_OBJECT) {
- ZVAL_DUP(entry, qarray_entry);
- convert_to_array(entry);
- php_http_querystring_update(entry, params_entry, NULL);
+ ZVAL_DUP(&tmp, qarray_entry);
+ convert_to_array(&tmp);
+ php_http_querystring_update(&tmp, params_entry, NULL);
+ entry = &tmp;
} else if ((FAILURE == is_identical_function(&equal, qarray_entry, params_entry)) || Z_TYPE(equal) != IS_TRUE) {
Z_TRY_ADDREF_P(params_entry);
entry = params_entry;
}
- if (entry) {
- if (key.key) {
- zend_hash_update(Z_ARRVAL_P(qarray), key.key, entry);
- } else {
- zend_hash_index_update(Z_ARRVAL_P(qarray), key.h, entry);
- }
+ if (key.key) {
+ zend_hash_update(Z_ARRVAL_P(qarray), key.key, entry ? entry : &tmp);
+ } else {
+ zend_hash_index_update(Z_ARRVAL_P(qarray), key.h, entry ? entry : &tmp);
}
} else {
zval entry, *entry_ptr = &entry;
PHP_HTTP_QUERYSTRING_GETTER(getArray, IS_ARRAY);
PHP_HTTP_QUERYSTRING_GETTER(getObject, IS_OBJECT);
-#ifdef PHP_HTTP_HAVE_ICONV
+#if PHP_HTTP_HAVE_ICONV
ZEND_BEGIN_ARG_INFO_EX(ai_HttpQueryString_xlate, 0, 0, 2)
ZEND_ARG_INFO(0, from_encoding)
ZEND_ARG_INFO(0, to_encoding)
PHP_ME(HttpQueryString, getIterator, ai_HttpQueryString_getIterator, ZEND_ACC_PUBLIC)
PHP_ME(HttpQueryString, getGlobalInstance, ai_HttpQueryString_getGlobalInstance, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#ifdef PHP_HTTP_HAVE_ICONV
+#if PHP_HTTP_HAVE_ICONV
PHP_ME(HttpQueryString, xlate, ai_HttpQueryString_xlate, ZEND_ACC_PUBLIC)
#endif