--- src/org/eclipse/swt/program/Program.java	2016-11-24 14:30:24.000000000 +0900
+++ src/org/eclipse/swt/program/Program.java	2017-03-07 14:30:24.000000000 +0900
@@ -161,6 +161,9 @@
 	if (OS.RegQueryValueEx (phkResult [0], (TCHAR) null, 0, null, (TCHAR) null, lpcbData) == 0) {
 		result = "";
 		int length = lpcbData [0] / TCHAR.sizeof;
+		if (lpcbData [0] % TCHAR.sizeof != 0) {
+			length++;
+		}
 		if (length != 0) {
 			/* Use the character encoding for the default locale */
 			TCHAR lpData = new TCHAR (0, length);