gh-901: Some farconfig files causes a crash

FarGroup · Jan 19, 2025 · 9772038 · 9772038
1 parent a3289bb
commit 9772038
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+drkns 2025-01-19 22:00:05+00:00 - build 6419
+
+1. gh-901: Some farconfig files causes a crash.
+
 --------------------------------------------------------------------------------
 drkns 2025-01-19 20:58:24+00:00 - build 6418
 

diff --git a/far/configdb.cpp b/far/configdb.cpp
@@ -242,25 +242,29 @@ bool deserialise_value(std::string_view const Type, char const* Value, auto cons
 {
 	if (Type == "qword"sv)
 	{
-		Setter(strtoull(Value, nullptr, 16));
+		if (Value)
+			Setter(strtoull(Value, nullptr, 16));
 		return true;
 	}
 
 	if (Type == "text"sv)
 	{
-		Setter(encoding::utf8::get_chars(Value));
+		if (Value)
+			Setter(encoding::utf8::get_chars(Value));
 		return true;
 	}
 
 	if (Type == "base64"sv)
 	{
-		Setter(base64::decode(Value));
+		if (Value)
+			Setter(base64::decode(Value));
 		return true;
 	}
 
 	if (Type == "hex"sv)
 	{
-		Setter(HexStringToBlob(encoding::utf8::get_chars(Value)));
+		if (Value)
+			Setter(HexStringToBlob(encoding::utf8::get_chars(Value)));
 		return true;
 	}
 

diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-6418
+6419