If in the implicit default field of a non-greedy short form, only read data until whitespace characters are reached. Improve tests accordingly.

1 files changed, 5 insertions, 2 deletions

diff --git a/src/core/parser/stack/Stack.cpp b/src/core/parser/stack/Stack.cpp
index cc1eb23..75a4b49 100644
--- a/src/core/parser/stack/Stack.cpp
+++ b/src/core/parser/stack/Stack.cpp
@@ -1528,8 +1528,11 @@ bool StackImpl::readToken(Token &token)
 {
 	if (dataReader != nullptr) {
 		dataReader->resetPeek();
-		return dataReader->peek(token, currentTokens(),
-		                        currentWhitespaceMode());
+		const HandlerInfo &info = currentInfo();
+		const bool endAtWhitespace =
+		    (!info.greedy && info.inImplicitDefaultField);
+		return dataReader->peek(token, currentTokens(), currentWhitespaceMode(),
+		                        endAtWhitespace);
 	}
 	return false;
 }