Commit 29b38a1

realFlowControlnielsdos

authored and

committed

Fix GH-19226: Segfault when spawning new thread in soap extension

1 parent 2645663 commit 29b38a1Copy full SHA for 29b38a1

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,10 @@ PHP NEWS`
`19`	`19`	`. Fixed GH-19197: build broken with ZEND_STRL usage with memcpy`
`20`	`20`	`when implemented as macro. (David Carlier)`
`21`	`21`
	`22`	`+- Soap:`
	`23`	`+ . Fixed bug GH-19226 (Segfault when spawning new thread in soap extension).`
	`24`	`+ (Florian Engelhardt)`
	`25`	`+`
`22`	`26`	`- Sockets:`
`23`	`27`	`. socket_set_option for multicast context throws a ValueError`
`24`	`28`	`when the socket family is not of AF_INET/AF_INET6 family. (David Carlier)`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -453,7 +453,6 @@ static void php_soap_init_globals(zend_soap_globals *soap_globals)`
`453`	`453`	`soap_globals->soap_version = SOAP_1_1;`
`454`	`454`	`soap_globals->mem_cache = NULL;`
`455`	`455`	`soap_globals->ref_map = NULL;`
`456`		`- soap_globals->lang_en = zend_string_init_interned(ZEND_STRL("en"), true);`
`457`	`456`	`}`
`458`	`457`
`459`	`458`	`PHP_MSHUTDOWN_FUNCTION(soap)`
`@@ -553,6 +552,8 @@ PHP_MINIT_FUNCTION(soap)`
`553`	`552`	`old_error_handler = zend_error_cb;`
`554`	`553`	`zend_error_cb = soap_error_handler;`
`555`	`554`
	`555`	`+ SOAP_GLOBAL(lang_en) = zend_string_init_interned(ZEND_STRL("en"), true);`
	`556`	`+`
`556`	`557`	`return SUCCESS;`
`557`	`558`	`}`
`558`	`559`
`@@ -4205,7 +4206,7 @@ static xmlNodePtr serialize_zval(zval val, sdlParamPtr param, const char param`
`4205`	`4206`	`}`
`4206`	`4207`	`xmlParam = master_to_xml(enc, val, style, parent);`
`4207`	`4208`	`zval_ptr_dtor(&defval);`
`4208`		`- if (xmlParam != NULL) {`
	`4209`	`+ if (xmlParam != NULL) {`
`4209`	`4210`	`if (xmlParam->name == NULL \|\| strcmp((char*)xmlParam->name, "BOGUS") == 0) {`
`4210`	`4211`	`xmlNodeSetName(xmlParam, BAD_CAST(paramName));`
`4211`	`4212`	`}`

Comments

(0)