GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — [[ Bug 19772 ]] Foreign handlers get repeatedly bound · livecode/livecode@4acb51f

This repository was archived by the owner on Aug 31, 2021. It is now read-only.

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

libscript/src
- script-instance.cpp

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎libscript/src/script-instance.cpp‎`

Copy file name to clipboardExpand all lines: libscript/src/script-instance.cpp

+28-49Lines changed: 28 additions & 49 deletions

Original file line number	Diff line number	Diff line change
`@@ -876,56 +876,38 @@ __MCScriptPrepareForeignFunction(MCScriptInstanceRef p_instance,`
`876`	`876`	`MCScriptForeignHandlerDefinition *p_handler,`
`877`	`877`	`bool *r_bound)`
`878`	`878`	`{`
`879`		`- bool t_bound = p_handler->is_bound;`
`880`		`-`
`881`		`- ffi_abi t_abi;`
`882`		`- if (!t_bound)`
`883`		`- {`
`884`		`- bool *t_bound_ptr = nullptr;`
	`879`	`+ // If the handler is already bound, then do nothing.`
	`880`	`+ if (p_handler->is_bound)`
	`881`	`+ {`
`885`	`882`	`if (r_bound != nullptr)`
`886`		`- t_bound_ptr = &t_bound;`
	`883`	`+ {`
	`884`	`+ *r_bound = true;`
	`885`	`+ }`
`887`	`886`
`888`		`- if (!__MCScriptResolveForeignFunctionBinding(p_instance,`
`889`		`- p_handler,`
`890`		`- t_abi,`
`891`		`- t_bound_ptr))`
`892`		`- {`
`893`		`- return false;`
`894`		`- }`
`895`		`-`
`896`		`- p_handler->is_bound = t_bound;`
`897`		`- }`
`898`		`-`
`899`		`- // If we are 'try to bind' and the foreign binding failed, then`
	`887`	`+ return true;`
	`888`	`+ }`
	`889`	`+`
	`890`	`+ // Attempt to resolve the foreign function binding. If r_bound == nullptr,`
	`891`	`+ // then this will fail if binding fails. If r_bound != nullptr, then *r_bound`
	`892`	`+ // will indicate whether the function was bound or not.`
	`893`	`+ ffi_abi t_abi;`
	`894`	`+ if (!__MCScriptResolveForeignFunctionBinding(p_instance,`
	`895`	`+ p_handler,`
	`896`	`+ t_abi,`
	`897`	`+ r_bound))`
	`898`	`+ {`
	`899`	`+ return false;`
	`900`	`+ }`
	`901`	`+`
	`902`	`+ // If we are 'try to bind' and the foreign binding failed, then`
`900`	`903`	`// return the bound status to the caller and return.`
`901`	`904`	`if (r_bound != nullptr &&`
`902`		`- !t_bound)`
	`905`	`+ !*r_bound)`
`903`	`906`	`{`
`904`		`- *r_bound = false;`
`905`		`- return true;`
`906`		`- }`
`907`		`-`
`908`		`- // If the function didn't produce a valid pointer either throw, or return`
`909`		`- // unbound depending on the r_bound out ptr.`
`910`		`- bool t_resolved;`
`911`		`- if (p_handler -> is_java)`
`912`		`- t_resolved = p_handler -> java . method_id != nullptr;`
`913`		`- else`
`914`		`- t_resolved = p_handler -> native . function != nullptr;`
`915`		`-`
`916`		`- if (!t_resolved)`
`917`		`- {`
`918`		`- if (r_bound == nullptr)`
`919`		`- {`
`920`		`- return MCScriptThrowUnableToResolveForeignHandlerError(p_instance,`
`921`		`- p_handler);`
`922`		`- }`
`923`		`-`
`924`		`- *r_bound = false;`
`925`		`-`
`926`	`907`	`return true;`
`927`	`908`	`}`
`928`		`-`
	`909`	`+`
	`910`	`+ // If we get here then it means that the binding succeeded.`
`929`	`911`	`MCTypeInfoRef t_signature;`
`930`	`912`	`t_signature = p_instance->module->types[p_handler->type]->typeinfo;`
`931`	`913`
`@@ -940,12 +922,9 @@ __MCScriptPrepareForeignFunction(MCScriptInstanceRef p_instance,`
`940`	`922`	`return false;`
`941`	`923`	`}`
`942`	`924`
`943`		`- // If we are a non-trapping bind, then indicate that we bound successfully.`
`944`		`- if (r_bound != nullptr)`
`945`		`- {`
`946`		`- *r_bound = true;`
`947`		`- }`
`948`		`-`
	`925`	`+ // The function can only be considered bound, if it gets to this point.`
	`926`	`+ p_handler->is_bound = true;`
	`927`	`+`
`949`	`928`	`return true;`
`950`	`929`	`}`
`951`	`930`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.