From: Michael Wallner <mike@php.net>
Date: Tue, 9 Mar 2021 06:56:45 +0000 (+0100)
Subject: ws
X-Git-Tag: v4.1.0~6
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=6ae4ed3671c5b6569a2f97a96c95ee4186959cc4;p=m6w6%2Fext-http

ws
---

diff --git a/src/php_http_client_curl.c b/src/php_http_client_curl.c
index 020cf28..849b4e2 100644
--- a/src/php_http_client_curl.c
+++ b/src/php_http_client_curl.c
@@ -2660,13 +2660,13 @@ php_http_client_ops_t *php_http_client_curl_get_ops(void)
 	return &php_http_client_curl_ops;
 }
 
-#define REGISTER_NS_STRING_OR_NULL_CONSTANT(ns, name, str, flags)                              \
-		do {                                                                           \
-			if ((str) != NULL) {                                                   \
-				REGISTER_NS_STRING_CONSTANT(ns, name, str, flags);             \
-			} else {                                                               \
-				REGISTER_NS_NULL_CONSTANT(ns, name, flags);                    \
-			}                                                                      \
+#define REGISTER_NS_STRING_OR_NULL_CONSTANT(ns, name, str, flags) \
+		do { \
+			if ((str) != NULL) { \
+				REGISTER_NS_STRING_CONSTANT(ns, name, str, flags); \
+			} else { \
+				REGISTER_NS_NULL_CONSTANT(ns, name, flags); \
+			} \
 		} while (0)
 
 PHP_MINIT_FUNCTION(http_client_curl)
@@ -2780,11 +2780,13 @@ PHP_MINIT_FUNCTION(http_client_curl)
 		REGISTER_NS_STRING_OR_NULL_CONSTANT("http\\Client\\Curl\\Versions", "ARES", info->ares, CONST_CS|CONST_PERSISTENT);
 		REGISTER_NS_STRING_OR_NULL_CONSTANT("http\\Client\\Curl\\Versions", "IDN", info->libidn, CONST_CS|CONST_PERSISTENT);
 		tmp_ver_init();
-		tmp_ptr = zend_print_ulong_to_buf(tmp_end, info->iconv_ver_num & 0xf);
-		tmp_end = tmp_ptr - 1;
-		tmp_ptr = zend_print_ulong_to_buf(tmp_end, info->iconv_ver_num >> 8);
-		*tmp_end = '.';
-		REGISTER_NS_STRING_OR_NULL_CONSTANT("http\\Client\\Curl\\Versions", "ICONV", tmp_ptr, CONST_CS|CONST_PERSISTENT);
+		if (info->iconv_ver_num) {
+			tmp_ptr = zend_print_ulong_to_buf(tmp_end, info->iconv_ver_num & 0xf);
+			tmp_end = tmp_ptr - 1;
+			tmp_ptr = zend_print_ulong_to_buf(tmp_end, info->iconv_ver_num >> 8);
+			*tmp_end = '.';
+		}
+		REGISTER_NS_STRING_OR_NULL_CONSTANT("http\\Client\\Curl\\Versions", "ICONV", *tmp_ptr ? tmp_ptr : NULL, CONST_CS|CONST_PERSISTENT);
 #if PHP_HTTP_CURL_VERSION(7,57,0)
 		REGISTER_NS_STRING_OR_NULL_CONSTANT("http\\Client\\Curl\\Versions", "BROTLI", info->brotli_version, CONST_CS|CONST_PERSISTENT);
 #endif