Fixed possible SIGSEGV (Rob Richards)

dstogov · dstogov · commit fd10ad58970d · 2005-12-09T15:29:28.000Z
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
@@ -265,7 +265,7 @@ xmlNodePtr master_to_xml(encodePtr encode, zval *data, int style, xmlNodePtr par
 				if (zend_hash_find(ht, "enc_ns", sizeof("enc_ns"), (void **)&zns) == SUCCESS) {
 				  enc = get_encoder(SOAP_GLOBAL(sdl), Z_STRVAL_PP(zns), Z_STRVAL_PP(zstype));
 				} else {
-				  enc = get_encoder(SOAP_GLOBAL(sdl), NULL, Z_STRVAL_PP(zstype));
+				  enc = get_encoder_ex(SOAP_GLOBAL(sdl), Z_STRVAL_PP(zstype), Z_STRLEN_PP(zstype));
 				}
 			}
 		}
diff --git a/ext/soap/php_schema.c b/ext/soap/php_schema.c
@@ -232,7 +232,11 @@ int load_schema(sdlCtx *ctx,xmlNodePtr schema)
 			location = get_attribute(trav->properties, "schemaLocation");
 
 			if (ns != NULL && tns != NULL && strcmp(ns->children->content,tns->children->content) == 0) {
-				soap_error1(E_ERROR, "Parsing Schema: can't import schema from '%s', namespace must not match the enclosing schema 'targetNamespace'", location->children->content);
+				if (location) {
+					soap_error1(E_ERROR, "Parsing Schema: can't import schema from '%s', namespace must not match the enclosing schema 'targetNamespace'", location->children->content);
+				} else {
+					soap_error0(E_ERROR, "Parsing Schema: can't import schema. Namespace must not match the enclosing schema 'targetNamespace'");
+				}
 			}
 			if (location) {
 				xmlChar *base = xmlNodeGetBase(trav->doc, trav);
diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
@@ -410,10 +410,10 @@ static sdlSoapBindingFunctionHeaderPtr wsdl_soap_binding_header(sdlCtx* ctx, xml
 				if (!h->ns && h->element->namens) {
 					h->ns = estrdup(h->element->namens);
 				}
-			}
-			if (h->element->name) {
-				efree(h->name);
-				h->name = estrdup(h->element->name);
+				if (h->element->name) {
+					efree(h->name);
+					h->name = estrdup(h->element->name);
+				}
 			}
 		}
 	}
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
@@ -1797,8 +1797,8 @@ PHP_METHOD(SoapServer, handle)
 /* }}} */
 
 
-/* {{{ proto SoapServer::fault
-   SoapServer::fault */
+/* {{{ proto SoapServer::fault ( staring code, string string [, string actor [, mixed details [, string name]]] )
+   Issue SoapFault indicating an error */
 PHP_METHOD(SoapServer, fault)
 {
 	char *code, *string, *actor=NULL, *name=NULL;

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ xmlNodePtr master_to_xml(encodePtr encode, zval *data, int style, xmlNodePtr par`
`265`	`265`	`if (zend_hash_find(ht, "enc_ns", sizeof("enc_ns"), (void **)&zns) == SUCCESS) {`
`266`	`266`	`enc = get_encoder(SOAP_GLOBAL(sdl), Z_STRVAL_PP(zns), Z_STRVAL_PP(zstype));`
`267`	`267`	`} else {`
`268`		`- enc = get_encoder(SOAP_GLOBAL(sdl), NULL, Z_STRVAL_PP(zstype));`
	`268`	`+ enc = get_encoder_ex(SOAP_GLOBAL(sdl), Z_STRVAL_PP(zstype), Z_STRLEN_PP(zstype));`
`269`	`269`	`}`
`270`	`270`	`}`
`271`	`271`	`}`
Original file line number	Diff line number	Diff line change
`@@ -410,10 +410,10 @@ static sdlSoapBindingFunctionHeaderPtr wsdl_soap_binding_header(sdlCtx* ctx, xml`
`410`	`410`	`if (!h->ns && h->element->namens) {`
`411`	`411`	`h->ns = estrdup(h->element->namens);`
`412`	`412`	`}`
`413`		`- }`
`414`		`- if (h->element->name) {`
`415`		`- efree(h->name);`
`416`		`- h->name = estrdup(h->element->name);`
	`413`	`+ if (h->element->name) {`
	`414`	`+ efree(h->name);`
	`415`	`+ h->name = estrdup(h->element->name);`
	`416`	`+ }`
`417`	`417`	`}`
`418`	`418`	`}`
`419`	`419`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1797,8 +1797,8 @@ PHP_METHOD(SoapServer, handle)`
`1797`	`1797`	`/* }}} */`
`1798`	`1798`
`1799`	`1799`
`1800`		`-/* {{{ proto SoapServer::fault`
`1801`		`- SoapServer::fault */`
	`1800`	`+/* {{{ proto SoapServer::fault ( staring code, string string [, string actor [, mixed details [, string name]]] )`
	`1801`	`+ Issue SoapFault indicating an error */`
`1802`	`1802`	`PHP_METHOD(SoapServer, fault)`
`1803`	`1803`	`{`
`1804`	`1804`	`char code, string, actor=NULL, name=NULL;`