shlwapi/tests: Fix uninitialized memory reads (Valgrind).

d6180c05 · Nikolay Sivov · Alexandre Julliard · 4cf70b14 · d6180c05
Commit d6180c05 authored Apr 11, 2015 by Nikolay Sivov Committed by Alexandre Julliard Apr 13, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 5 deletions

path.c dlls/shlwapi/tests/path.c +10 -5

No files found.
--- a/dlls/shlwapi/tests/path.c
+++ b/dlls/shlwapi/tests/path.c
@@ -183,13 +183,18 @@ static const struct {

 /* ################ */

-static LPWSTR GetWideString(const char* szString)
+static LPWSTR GetWideString(const char *src)
 {
-  LPWSTR wszString = HeapAlloc(GetProcessHeap(), 0, (2*INTERNET_MAX_URL_LENGTH) * sizeof(WCHAR));
-  
-  MultiByteToWideChar(CP_ACP, 0, szString, -1, wszString, INTERNET_MAX_URL_LENGTH);
+  WCHAR *ret;

-  return wszString;
+  if (!src)
+    return NULL;
+
+  ret = HeapAlloc(GetProcessHeap(), 0, (2*INTERNET_MAX_URL_LENGTH) * sizeof(WCHAR));
+
+  MultiByteToWideChar(CP_ACP, 0, src, -1, ret, INTERNET_MAX_URL_LENGTH);
+
+  return ret;
 }

 static void FreeWideString(LPWSTR wszString)