From 69c7c2f7493695aa4eb73d96e16a37b67c16f521 Mon Sep 17 00:00:00 2001 From: HisShadow Date: Tue, 19 Dec 2023 14:52:28 +0300 Subject: [PATCH] additional svace fixes --- php-7.4.30-svace-fixes.patch | 41 ++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/php-7.4.30-svace-fixes.patch b/php-7.4.30-svace-fixes.patch index e54ee63..b6ed33e 100644 --- a/php-7.4.30-svace-fixes.patch +++ b/php-7.4.30-svace-fixes.patch @@ -282,3 +282,44 @@ index b0de6e4..5e3adec 100644 } tmp_len = newfile_len; +diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c +index 6ce9d4b..d8e26f6 100644 +--- a/ext/enchant/enchant.c ++++ b/ext/enchant/enchant.c +@@ -269,7 +269,9 @@ static void php_enchant_dict_free(zend_resource *rsrc) /* {{{ */ + enchant_broker_free_dict(pbroker->pbroker, pdict->pdict); + } + +- pbroker->dict[pdict->id] = NULL; ++ if (pbroker->dict) ++ pbroker->dict[pdict->id] = NULL; ++ + efree(pdict); + zend_list_delete(pbroker->rsrc); + } +diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c +index ac476b3..9b51dd0 100644 +--- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c ++++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c +@@ -682,7 +682,7 @@ mbfl_filt_conv_jis2004_flush(mbfl_convert_filter *filter) + k = filter->cache; + filter->cache = 0; + +- if (filter->status == 1 && k >= 0 && k <= jisx0213_u2_tbl_len) { ++ if (filter->status == 1 && k >= 0 && k < jisx0213_u2_tbl_len) { + s1 = jisx0213_u2_fb_tbl[k]; + + if (filter->to->no_encoding == mbfl_no_encoding_sjis2004) { +diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c +index e0cf63d..d30d9e1 100644 +--- a/ext/soap/php_encoding.c ++++ b/ext/soap/php_encoding.c +@@ -907,7 +907,7 @@ static xmlNodePtr to_xml_string(encodeTypePtr type, zval *data, int style, xmlNo + xmlAddChild(ret, text); + efree(str); + +- if (style == SOAP_ENCODED) { ++ if (style == SOAP_ENCODED && type) { + set_ns_and_type(ret, type); + } + return ret;