Djam/php7
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/php7.git synced 2025-02-23 23:02:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'rosa2021.1' into rosa2023.1

Browse source
This commit is contained in:
Mikhail Novosyolov 2023-12-19 15:14:05 +03:00
commit f144518b2b
1 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
php-7.4.30-svace-fixes.patch
View file

@ -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;