ConfigPath: return early on "~"

Previously, the pointer was moved to undefined memory.

ConfigPath: return early on "~"
89d2d648 · Max Kellermann · 7532f24d · 89d2d648
Commit 89d2d648 authored Sep 12, 2013 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

ConfigPath.cxx src/ConfigPath.cxx +6 -3

No files found.
--- a/src/ConfigPath.cxx
+++ b/src/ConfigPath.cxx
@@ -84,11 +84,14 @@ ParsePath(const char *path, Error &error)

 #ifndef WIN32
 	if (path[0] == '~') {
-		Path home = Path::Null();
-
 		++path;

-		if (*path == '/' || *path == '\0') {
+		if (*path == '\0')
+			return GetConfiguredHome(error);
+
+		Path home = Path::Null();
+
+		if (*path == '/') {
 			home = GetConfiguredHome(error);

 			++path;