Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 01:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added check for null schema type being passed in. Also made the type

Browse Source 
not specified where it was AnyType or could be trivially derived from
the element name and namespaceURI being used.

SOAP is not part of default build.
This commit is contained in:
rayw%netscape.com 2002-02-16 12:25:11 +00:00
parent 4182a410dc
commit 4a5f889db8
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/webservices/soap/src/nsDefaultSOAPEncoder.cpp
View File

@ -481,6 +481,7 @@ EncodeSimpleValue(nsISOAPEncoding * aEncoding,
nsIDOMElement * aDestination, nsIDOMElement ** _retval)
{
nsresult rc;
PRBool needType = PR_FALSE;
nsAutoString typeName;
nsAutoString typeNS;
if (aSchemaType) {
@ -490,6 +491,7 @@ EncodeSimpleValue(nsISOAPEncoding * aEncoding,
rc = aSchemaType->GetTargetNamespace(typeNS);
if (NS_FAILED(rc))
return rc;
needType = !(typeName.Equals(kAnyTypeSchemaType) && typeNS.Equals(nsSOAPUtils::kXSURI));
}
nsAutoString name; // First choose the appropriate name and namespace for the element.
nsAutoString ns;
@ -497,7 +499,8 @@ EncodeSimpleValue(nsISOAPEncoding * aEncoding,
ns = nsSOAPUtils::kSOAPEncURI;
nsAutoString currentURI = ns;
nsCOMPtr<nsISchemaType>currentType = aSchemaType;
while (!(typeNS.Equals(nsSOAPUtils::kXSURI)
while (currentType
&& !(typeNS.Equals(nsSOAPUtils::kXSURI)
|| typeNS.Equals(nsSOAPUtils::kSOAPEncURI))) {
nsCOMPtr<nsISchemaType> supertype;
rc = GetSupertype(aEncoding, currentType, getter_AddRefs(supertype));
@ -516,9 +519,11 @@ EncodeSimpleValue(nsISOAPEncoding * aEncoding,
rc = aSchemaType->GetName(name);
if (NS_FAILED(rc))
return rc;
needType = needType && (currentType != aSchemaType); // We may not need type
}
else {
name = kAnyTypeSchemaType;
needType = PR_FALSE;
}
rc = aEncoding->GetExternalSchemaURI(nsSOAPUtils::kSOAPEncURI, ns);
}
@ -540,7 +545,7 @@ EncodeSimpleValue(nsISOAPEncoding * aEncoding,
rc = aDestination->AppendChild(element, getter_AddRefs(ignore));
if (NS_FAILED(rc))
return rc;
if (!typeName.IsEmpty()) {
if (needType) {
nsAutoString type;
rc = nsSOAPUtils::MakeNamespacePrefix(aEncoding, element,
typeNS, type);

9
extensions/xmlextras/soap/src/nsDefaultSOAPEncoder.cpp
View File

@ -481,6 +481,7 @@ EncodeSimpleValue(nsISOAPEncoding * aEncoding,
nsIDOMElement * aDestination, nsIDOMElement ** _retval)
{
nsresult rc;
PRBool needType = PR_FALSE;
nsAutoString typeName;
nsAutoString typeNS;
if (aSchemaType) {
@ -490,6 +491,7 @@ EncodeSimpleValue(nsISOAPEncoding * aEncoding,
rc = aSchemaType->GetTargetNamespace(typeNS);
if (NS_FAILED(rc))
return rc;
needType = !(typeName.Equals(kAnyTypeSchemaType) && typeNS.Equals(nsSOAPUtils::kXSURI));
}
nsAutoString name; // First choose the appropriate name and namespace for the element.
nsAutoString ns;
@ -497,7 +499,8 @@ EncodeSimpleValue(nsISOAPEncoding * aEncoding,
ns = nsSOAPUtils::kSOAPEncURI;
nsAutoString currentURI = ns;
nsCOMPtr<nsISchemaType>currentType = aSchemaType;
while (!(typeNS.Equals(nsSOAPUtils::kXSURI)
while (currentType
&& !(typeNS.Equals(nsSOAPUtils::kXSURI)
|| typeNS.Equals(nsSOAPUtils::kSOAPEncURI))) {
nsCOMPtr<nsISchemaType> supertype;
rc = GetSupertype(aEncoding, currentType, getter_AddRefs(supertype));
@ -516,9 +519,11 @@ EncodeSimpleValue(nsISOAPEncoding * aEncoding,
rc = aSchemaType->GetName(name);
if (NS_FAILED(rc))
return rc;
needType = needType && (currentType != aSchemaType); // We may not need type
}
else {
name = kAnyTypeSchemaType;
needType = PR_FALSE;
}
rc = aEncoding->GetExternalSchemaURI(nsSOAPUtils::kSOAPEncURI, ns);
}
@ -540,7 +545,7 @@ EncodeSimpleValue(nsISOAPEncoding * aEncoding,
rc = aDestination->AppendChild(element, getter_AddRefs(ignore));
if (NS_FAILED(rc))
return rc;
if (!typeName.IsEmpty()) {
if (needType) {
nsAutoString type;
rc = nsSOAPUtils::MakeNamespacePrefix(aEncoding, element,
typeNS, type);