From 9b66864a124cfaa40908a43ae368184c34689b61 Mon Sep 17 00:00:00 2001
From: Benoit Hiller
Date: Tue, 12 Mar 2013 20:42:21 -0400
Subject: adding guard for null strings to extract method

---
 .../Eclipse SWT CEF/win32/org/eclipse/swt/browser/CEF.java          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.swt/Eclipse SWT CEF/win32/org/eclipse/swt/browser/CEF.java b/bundles/org.eclipse.swt/Eclipse SWT CEF/win32/org/eclipse/swt/browser/CEF.java
index a274374423..bb3035f411 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT CEF/win32/org/eclipse/swt/browser/CEF.java	
+++ b/bundles/org.eclipse.swt/Eclipse SWT CEF/win32/org/eclipse/swt/browser/CEF.java	
@@ -172,12 +172,16 @@ static long /*int*/ CreateCEFString(String string) {
 }
 
 static String ExtractCEFString(long /*int*/ stringPointer) {
+	if (stringPointer == 0) {
+		return "";
+	}
+	
 	cef_string_t cefStringUrl = new cef_string_t();
 	CEF3.memmove(cefStringUrl, stringPointer, CEF3.cef_string_t_sizeof());
 
 	int length = (int)/*64*/cefStringUrl.length;
 	char[] chars = new char[length]; 
-	OS.memmove(chars, cefStringUrl.str, length * 2); 
+	OS.memmove(chars, (int)/*64*/cefStringUrl.str, length * 2); 
 	return new String(chars); 
 }
 
-- 
cgit v1.2.3