Merge branch 'bugfix-12701' into develop

runrevmark · runrevmark · commit e8c8aef5fa26 · 2014-06-25T16:33:47.000+01:00
diff --git a/docs/notes/bugfix-12701.md b/docs/notes/bugfix-12701.md
@@ -0,0 +1 @@
+# CEF browser crashes if htmltext is set to empty
diff --git a/revbrowser/src/cefbrowser.cpp b/revbrowser/src/cefbrowser.cpp
@@ -1120,6 +1120,11 @@ char *MCCefBrowserBase::GetSource(void)
 
 void MCCefBrowserBase::SetSource(const char *p_source)
 {
+	// IM-2014-06-25: [[ Bug 12701 ]] CEF will crash if given an empty source string,
+	// so replace here with the source of an empty page :)
+	if (p_source == nil || MCCStringLength(p_source) == 0)
+		p_source = "<html><head></head><body></body></html>";
+	
 	CefString t_source;
 	/* UNCHECKED */ MCCefStringFromCString(p_source, t_source);
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# CEF browser crashes if htmltext is set to empty`