Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes bug 141765, r=heikki, sr=jst, rs=rayw.

Browse Source 
This is a very simple, safe fix that fixes a crash in decoding structures
inside of arrays in SOAP, and affects nothing else.


git-svn-id: svn://10.0.0.236/trunk@120690 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rayw%netscape.com 2002-05-03 11:56:31 +00:00
parent 209d34721d
commit d29baad3e5
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/extensions/webservices/soap/src/nsDefaultSOAPEncoder.cpp
View File

@ -2567,7 +2567,7 @@ static nsresult CreateArray(nsIWritableVariant* aResult, PRUint16 aType, const n
aArray += size;
}
if (!NS_FAILED(rc)) {
rc = aResult->SetAsArray(nsIDataType::VTYPE_INTERFACE,&NS_GET_IID(nsIVariant),count,a);
rc = aResult->SetAsArray(nsIDataType::VTYPE_INTERFACE_IS,&NS_GET_IID(nsIVariant),count,a);
}
for (i = 0; i < count; i++) { // Release variants for array
nsIVariant* v = a[i];
@ -2903,8 +2903,9 @@ NS_IMETHODIMP
unhandled = PR_TRUE;
}
if (unhandled) { // Handle all the other cases
DECODE_ARRAY(nsIVariant*,INTERFACE,&NS_GET_IID(nsIVariant),a[p] = v;,
for (si = 0; si < size; si++) NS_RELEASE(a[si]););
DECODE_ARRAY(nsIVariant*,INTERFACE_IS,&NS_GET_IID(nsIVariant),
a[p] = v;NS_ADDREF(a[p]);,
for (si = 0; si < size; si++) NS_RELEASE(a[si]););
}
if (NS_FAILED(rc))\
return rc;

7
mozilla/extensions/xmlextras/soap/src/nsDefaultSOAPEncoder.cpp
View File

@ -2567,7 +2567,7 @@ static nsresult CreateArray(nsIWritableVariant* aResult, PRUint16 aType, const n
aArray += size;
}
if (!NS_FAILED(rc)) {
rc = aResult->SetAsArray(nsIDataType::VTYPE_INTERFACE,&NS_GET_IID(nsIVariant),count,a);
rc = aResult->SetAsArray(nsIDataType::VTYPE_INTERFACE_IS,&NS_GET_IID(nsIVariant),count,a);
}
for (i = 0; i < count; i++) { // Release variants for array
nsIVariant* v = a[i];
@ -2903,8 +2903,9 @@ NS_IMETHODIMP
unhandled = PR_TRUE;
}
if (unhandled) { // Handle all the other cases
DECODE_ARRAY(nsIVariant*,INTERFACE,&NS_GET_IID(nsIVariant),a[p] = v;,
for (si = 0; si < size; si++) NS_RELEASE(a[si]););
DECODE_ARRAY(nsIVariant*,INTERFACE_IS,&NS_GET_IID(nsIVariant),
a[p] = v;NS_ADDREF(a[p]);,
for (si = 0; si < size; si++) NS_RELEASE(a[si]););
}
if (NS_FAILED(rc))\
return rc;