Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Handle exceptions from FindEnumStringIndex correctly.

Browse source 
The previous code would return success from the JSNative with a pending
exception, potentially leading to assertion failures inside the JS engine
later.
This commit is contained in:
Ms2ger 2014-04-18 10:16:21 +02:00
parent baa3845362
commit d53841b016
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -739,13 +739,14 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
template = ( template = (
"match FindEnumStringIndex(cx, ${val}, %(values)s) {\n" "match FindEnumStringIndex(cx, ${val}, %(values)s) {\n"
" Err(_) => { %(handleInvalidEnumValueCode)s },\n" " Err(_) => { %(exceptionCode)s },\n"
" Ok(None) => { %(handleInvalidEnumValueCode)s },\n" " Ok(None) => { %(handleInvalidEnumValueCode)s },\n"
" Ok(Some(index)) => {\n" " Ok(Some(index)) => {\n"
" //XXXjdm need some range checks up in here.\n" " //XXXjdm need some range checks up in here.\n"
" ${declName} = cast::transmute(index);\n" " ${declName} = cast::transmute(index);\n"
" },\n" " },\n"
"}" % { "values" : enum + "Values::strings", "}" % { "values" : enum + "Values::strings",
"exceptionCode" : exceptionCode,
"handleInvalidEnumValueCode" : handleInvalidEnumValueCode }) "handleInvalidEnumValueCode" : handleInvalidEnumValueCode })
if defaultValue is not None: if defaultValue is not None: