Bug 387393 - GetAttr asserts non null nsIAtom but accessible doesn't null check r=ginn.chen, a=dsicore for 1.9

This commit is contained in:
Evan.Yan@Sun.COM 2007-08-05 20:44:41 -07:00
Родитель 90f33cba89
Коммит 31389d3c6b
1 изменённых файлов: 2 добавлений и 0 удалений

Просмотреть файл

@ -2113,6 +2113,7 @@ nsAccessible::GetAttributes(nsIPersistentProperties **aAttributes)
for (PRUint32 index = 0; index < NS_ARRAY_LENGTH(ariaProperties); index ++) {
nsAutoString value;
nsCOMPtr<nsIAtom> attr = do_GetAtom(ariaProperties[index]);
NS_ENSURE_TRUE(attr, NS_ERROR_OUT_OF_MEMORY);
if (content->GetAttr(kNameSpaceID_WAIProperties, attr, value)) {
ToLowerCase(value);
attributes->SetStringProperty(nsDependentCString(ariaProperties[index]), value, oldValueUnused);
@ -2259,6 +2260,7 @@ PRBool nsAccessible::MappedAttrState(nsIContent *aContent, PRUint32 *aStateInOut
nsAutoString attribValue;
nsCOMPtr<nsIAtom> attribAtom = do_GetAtom(aStateMapEntry->attributeName); // XXX put atoms directly in entry
NS_ENSURE_TRUE(attribAtom, NS_ERROR_OUT_OF_MEMORY);
if (aContent->GetAttr(kNameSpaceID_WAIProperties, attribAtom, attribValue)) {
if (aStateMapEntry->attributeValue == kBoolState) {
// No attribute value map specified in state map entry indicates state cleared