ConfigData: handle default_value==nullptr

Return Path::Null() instead of dying from assertion failure.

ConfigData: handle default_value==nullptr
0339c8d0 · Max Kellermann · 0e0be024 · 0339c8d0
Commit 0339c8d0 authored Oct 02, 2013 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

ConfigData.cxx src/ConfigData.cxx +5 -1

No files found.
--- a/src/ConfigData.cxx
+++ b/src/ConfigData.cxx
@@ -108,8 +108,12 @@ config_param::GetBlockPath(const char *name, const char *default_value,
 	if (bp != nullptr) {
 		line2 = bp->line;
 		s = bp->value.c_str();
-	} else
+	} else {
+		if (default_value == nullptr)
+			return Path::Null();
+
 		s = default_value;
+	}

 	Path path = ParsePath(s, error);
 	if (gcc_unlikely(path.IsNull()))