Backing out part of bug 417018 which caused bug 421650.
git-svn-id: svn://10.0.0.236/trunk@247460 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
3db33792b2
commit
0ebe4a67ad
@ -1470,6 +1470,8 @@ nsAccessibleWrap::get_attributes(BSTR *aAttributes)
|
||||
// The format is name:value;name:value; with \ for escaping these
|
||||
// characters ":;=,\".
|
||||
__try {
|
||||
*aAttributes = NULL;
|
||||
|
||||
nsCOMPtr<nsIPersistentProperties> attributes;
|
||||
if (NS_FAILED(GetAttributes(getter_AddRefs(attributes))))
|
||||
return E_FAIL;
|
||||
@ -1521,9 +1523,8 @@ __try {
|
||||
strAttrs.Append(';');
|
||||
}
|
||||
|
||||
INT res = ::SysReAllocStringLen(aAttributes, strAttrs.get(),
|
||||
strAttrs.Length());
|
||||
if (!res)
|
||||
*aAttributes = ::SysAllocString(strAttrs.get());
|
||||
if (!*aAttributes)
|
||||
return E_OUTOFMEMORY;
|
||||
|
||||
} __except(nsAccessNodeWrap::FilterA11yExceptions(::GetExceptionCode(), GetExceptionInformation())) { }
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user