| ... | ... | --- a/php-7.4.30-svace-fixes.patch |
| ... | ... | +++ b/php-7.4.30-svace-fixes.patch |
| ... | ... | @@ -282,3 +282,44 @@ index b0de6e4..5e3adec 100644 |
| 282 | 282 |
}
|
| 283 | 283 |
|
| 284 | 284 |
tmp_len = newfile_len;
|
| 285 |
diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c
|
|
| 286 |
index 6ce9d4b..d8e26f6 100644
|
|
| 287 |
--- a/ext/enchant/enchant.c
|
|
| 288 |
+++ b/ext/enchant/enchant.c
|
|
| 289 |
@@ -269,7 +269,9 @@ static void php_enchant_dict_free(zend_resource *rsrc) /* {{{ */
|
|
| 290 |
enchant_broker_free_dict(pbroker->pbroker, pdict->pdict);
|
|
| 291 |
}
|
|
| 292 |
|
|
| 293 |
- pbroker->dict[pdict->id] = NULL;
|
|
| 294 |
+ if (pbroker->dict)
|
|
| 295 |
+ pbroker->dict[pdict->id] = NULL;
|
|
| 296 |
+
|
|
| 297 |
efree(pdict);
|
|
| 298 |
zend_list_delete(pbroker->rsrc);
|
|
| 299 |
}
|
|
| 300 |
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c b/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c
|
|
| 301 |
index ac476b3..9b51dd0 100644
|
|
| 302 |
--- a/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c
|
|
| 303 |
+++ b/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c
|
|
| 304 |
@@ -682,7 +682,7 @@ mbfl_filt_conv_jis2004_flush(mbfl_convert_filter *filter)
|
|
| 305 |
k = filter->cache;
|
|
| 306 |
filter->cache = 0;
|
|
| 307 |
|
|
| 308 |
- if (filter->status == 1 && k >= 0 && k <= jisx0213_u2_tbl_len) {
|
|
| 309 |
+ if (filter->status == 1 && k >= 0 && k < jisx0213_u2_tbl_len) {
|
|
| 310 |
s1 = jisx0213_u2_fb_tbl[k];
|
|
| 311 |
|
|
| 312 |
if (filter->to->no_encoding == mbfl_no_encoding_sjis2004) {
|
|
| 313 |
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
|
|
| 314 |
index e0cf63d..d30d9e1 100644
|
|
| 315 |
--- a/ext/soap/php_encoding.c
|
|
| 316 |
+++ b/ext/soap/php_encoding.c
|
|
| 317 |
@@ -907,7 +907,7 @@ static xmlNodePtr to_xml_string(encodeTypePtr type, zval *data, int style, xmlNo
|
|
| 318 |
xmlAddChild(ret, text);
|
|
| 319 |
efree(str);
|
|
| 320 |
|
|
| 321 |
- if (style == SOAP_ENCODED) {
|
|
| 322 |
+ if (style == SOAP_ENCODED && type) {
|
|
| 323 |
set_ns_and_type(ret, type);
|
|
| 324 |
}
|
|
| 325 |
return ret;
|
New comment