diff --git a/mozilla/cmd/dialup/win/aswplugn/src/fileio.cpp b/mozilla/cmd/dialup/win/aswplugn/src/fileio.cpp
index 9537fb0a9ec..8108fd7d6ca 100644
--- a/mozilla/cmd/dialup/win/aswplugn/src/fileio.cpp
+++ b/mozilla/cmd/dialup/win/aswplugn/src/fileio.cpp
@@ -209,7 +209,8 @@ native_netscape_npasw_SetupPlugin_SECURE_0005fGetNameValuePair(JRIEnv *env,
 
 		ret = GetPrivateProfileString(section, name, "", buf, INI_BUFFER_SIZE, file);
 
-		len = (short)ret + 1;
+		// len = (short)ret + 1; // This appears to be incorrect, causes null char in string
+		len = (short)ret;
 	}
 
 	value = JRI_NewStringPlatform(env, buf, len, NULL, 0);
diff --git a/mozilla/cmd/dialup/win/aswplugn/src/sysnregi.cpp b/mozilla/cmd/dialup/win/aswplugn/src/sysnregi.cpp
index cf6d74e7f20..523f951d26d 100644
--- a/mozilla/cmd/dialup/win/aswplugn/src/sysnregi.cpp
+++ b/mozilla/cmd/dialup/win/aswplugn/src/sysnregi.cpp
@@ -522,7 +522,8 @@ java_lang_String * getRegElement(JRIEnv *env,
 			}
 
 
-			long length = 1 + strlen(value);  // 1 extra for the null char
+			// long length = 1 + strlen(value);  // 1 extra for the null char -- WRONG!
+			long length = strlen(value);
 
 			if (extendLen == TRUE) {
 				rtnValue = (char *)malloc(sizeof(char) * length);