wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1143760 - Do a tiny amount of code duplication to avoid a goto in XPCVariant::VariantDataToJS(). r=bholley

Browse Source
This commit is contained in:
Andrew McCreight 2015-03-18 11:36:04 -07:00
parent f0b7c05cd7
commit 4e3fcea818
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/xpconnect/src/XPCVariant.cpp
View File

@ -561,7 +561,6 @@ XPCVariant::VariantDataToJS(nsIVariant* variant,
// must exit via VARIANT_DONE from here on...
du.mType = nsIDataType::VTYPE_ARRAY;
bool success = false;
nsXPTType conversionType;
uint16_t elementType = du.u.array.mArrayType;
@ -613,16 +612,16 @@ XPCVariant::VariantDataToJS(nsIVariant* variant,
case nsIDataType::VTYPE_EMPTY:
default:
NS_ERROR("bad type in array!");
goto VARIANT_DONE;
nsVariant::Cleanup(&du);
return false;
}
success =
bool success =
XPCConvert::NativeArray2JS(pJSVal,
(const void**)&du.u.array.mArrayValue,
conversionType, pid,
du.u.array.mArrayCount, pErr);
VARIANT_DONE:
nsVariant::Cleanup(&du);
return success;
}