[[ bug 22689 ]] Return empty string if JS function call has no return value

Ian Macphail · Ian Macphail · commit 5680820a4daf · 2020-04-20T14:47:27.000+01:00
This patch fixes a bug in libbrowser where null would be returned when
evaluating a JavaScript statement with no result value. The empty string will
be returned instead.
diff --git a/libbrowser/src/libbrowser_wkwebview.mm b/libbrowser/src/libbrowser_wkwebview.mm
@@ -991,8 +991,8 @@ void _SyncEvaluateJavaScript(WKWebView *p_view, NSString *p_javascript, id &r_re
 	
 	if (t_result == nil)
 	{
-		r_result = nil;
-		return true;
+		// return the empty string if there is no result value
+		return MCCStringClone("", r_result);
 	}
 	
 	NSString *t_result_string = [NSString stringWithFormat:@"%@", t_result];

Original file line number	Diff line number	Diff line change
`@@ -991,8 +991,8 @@ void _SyncEvaluateJavaScript(WKWebView p_view, NSString p_javascript, id &r_re`
`991`	`991`
`992`	`992`	`if (t_result == nil)`
`993`	`993`	`{`
`994`		`- r_result = nil;`
`995`		`- return true;`
	`994`	`+ // return the empty string if there is no result value`
	`995`	`+ return MCCStringClone("", r_result);`
`996`	`996`	`}`
`997`	`997`
`998`	`998`	`NSString *t_result_string = [NSString stringWithFormat:@"%@", t_result];`