Fix narrow_to_wide_c (ANDROID)

Zeno- · Zeno- · commit aefe80769bc5 · 2015-03-02T13:16:01.000+10:00
* Ensure converted string is NUL terminated
* Restore logic to that used prior to 9e2a9b5
diff --git a/src/util/string.cpp b/src/util/string.cpp
@@ -83,16 +83,18 @@ const wchar_t *narrow_to_wide_c(const char *mbs)
 	size_t mbl = strlen(mbs);
 	wchar_t *wcs = new wchar_t[mbl + 1];
 
-	for (size_t i = 0; i < mbl; i++) {
+	size_t i, dest_i = 0;
+	for (i = 0; i < mbl; i++) {
 		if (((unsigned char) mbs[i] > 31) &&
 				((unsigned char) mbs[i] < 127)) {
-			wcs[i] = wide_chars[(unsigned char) mbs[i] - 32];
+			wcs[dest_i++] = wide_chars[(unsigned char) mbs[i] - 32];
 		}
 		//handle newline
 		else if (mbs[i] == '\n') {
-			wcs[i] = L'\n';
+			wcs[dest_i++] = L'\n';
 		}
 	}
+	wcs[dest_i] = '\0';
 
 	return wcs;
 }

Original file line number	Diff line number	Diff line change
`@@ -83,16 +83,18 @@ const wchar_t narrow_to_wide_c(const char mbs)`
`83`	`83`	`size_t mbl = strlen(mbs);`
`84`	`84`	`wchar_t *wcs = new wchar_t[mbl + 1];`
`85`	`85`
`86`		`- for (size_t i = 0; i < mbl; i++) {`
	`86`	`+ size_t i, dest_i = 0;`
	`87`	`+ for (i = 0; i < mbl; i++) {`
`87`	`88`	`if (((unsigned char) mbs[i] > 31) &&`
`88`	`89`	`((unsigned char) mbs[i] < 127)) {`
`89`		`- wcs[i] = wide_chars[(unsigned char) mbs[i] - 32];`
	`90`	`+ wcs[dest_i++] = wide_chars[(unsigned char) mbs[i] - 32];`
`90`	`91`	`}`
`91`	`92`	`//handle newline`
`92`	`93`	`else if (mbs[i] == '\n') {`
`93`		`- wcs[i] = L'\n';`
	`94`	`+ wcs[dest_i++] = L'\n';`
`94`	`95`	`}`
`95`	`96`	`}`
	`97`	`+ wcs[dest_i] = '\0';`
`96`	`98`
`97`	`99`	`return wcs;`
`98`	`100`	`}`