FDB: fix error when parsing incomplete variable in FQL expression

Doxense · Dec 10, 2024 · 48a6d30 · 48a6d30
1 parent 0faaf95
commit 48a6d30
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/FoundationDB.Client/Query/FqlQueryParser.cs b/FoundationDB.Client/Query/FqlQueryParser.cs
@@ -372,7 +372,7 @@ private static string ReadName(ref ReadOnlySpan<char> text)
 		}
 
 		/// <summary>Reads an decodes a variable</summary>
-		private static (FqlVariableTypes Types, string? Name) ReadVariable(ref ReadOnlySpan<char> text)
+		private static Maybe<(FqlVariableTypes Types, string? Name)> ReadVariable(ref ReadOnlySpan<char> text)
 		{
 			// note: the called has already consumed the leading '<'
 
@@ -395,7 +395,7 @@ private static (FqlVariableTypes Types, string? Name) ReadVariable(ref ReadOnlyS
 				var type = FqlTupleItem.ParseVariableTypeLiteral(text[..p]);
 				if (type == FqlVariableTypes.None)
 				{
-					throw new FormatException($"Invalid variable type '{text[..p]}'");
+					return new FormatException($"Invalid variable type '{text[..p]}'");
 				}
 				types |= type;
 
@@ -409,7 +409,7 @@ private static (FqlVariableTypes Types, string? Name) ReadVariable(ref ReadOnlyS
 				text = text[(p + 1)..];
 			}
 
-			throw new FormatException("Truncated variable");
+			return new FormatException("Truncated variable");
 		}
 
 		private static bool CouldBeUuid(ReadOnlySpan<char> text) => text.Length >= 36 && text[8] == '-' && text[13] == '-' && text[18] == '-' && text[23] == '-';
@@ -616,8 +616,11 @@ private static Maybe<FqlTupleExpression> ReadTuple(ref ReadOnlySpan<char> text)
 					{ // variable
 
 						text = text[1..];
-						var (types, name) = ReadVariable(ref text);
-						tuple.Var(types, name);
+						if (!ReadVariable(ref text).Check(out var res, out var error))
+						{
+							return error;
+						}
+						tuple.Var(res.Types, res.Name);
 						continue;
 					}
 					case ',':