Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions drivers/python/age/builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,12 @@ def visitAgValue(self, ctx:AgtypeParser.AgValueContext):

# Visit a parse tree produced by AgtypeParser#StringValue.
def visitStringValue(self, ctx:AgtypeParser.StringValueContext):
return ctx.STRING().getText().strip('"')
# The STRING token always has surrounding '"' delimiters per the
# Agtype grammar. str.strip('"') would also drop any '"' characters
# that are part of the actual data when the value starts or ends
# with an escaped quote, e.g. '"foo \\"bar\\""' -> 'foo \\"bar\\',
# so trim exactly the first and last character instead.
return ctx.STRING().getText()[1:-1]


# Visit a parse tree produced by AgtypeParser#IntegerValue.
Expand Down Expand Up @@ -182,7 +187,8 @@ def visitPair(self, ctx:AgtypeParser.PairContext):
raise AGTypeError(ctx.getText(), "Missing key in object pair")
if agValNode is None:
raise AGTypeError(ctx.getText(), "Missing value in object pair")
return (strNode.getText().strip('"') , agValNode)
# See visitStringValue() for why we slice instead of using strip('"').
return (strNode.getText()[1:-1] , agValNode)


# Visit a parse tree produced by AgtypeParser#array.
Expand Down
14 changes: 14 additions & 0 deletions drivers/python/test_agtypes.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,20 @@ def test_array_of_mixed_types(self):
self.assertEqual(result[4], [1, 2, 3])
self.assertEqual(result[5], {"key": "val"})

def test_string_value_preserves_inner_quotes(self):
"""Issue #2418: visitStringValue must remove only the outer quote
delimiters, not every '"' on either side, otherwise values that end
with an escaped quote (e.g. '"foo \\"bar\\""') lose data."""
self.assertEqual(self.parse('"foo \\"bar\\""'), 'foo \\"bar\\"')
self.assertEqual(self.parse('"\\"leading"'), '\\"leading')
self.assertEqual(self.parse('"trailing\\""'), 'trailing\\"')
self.assertEqual(self.parse('""'), '')
# Same fix applies to visitPair() for object keys.
self.assertEqual(
self.parse('{"key\\"q": 1}'),
{'key\\"q': 1},
)

def test_malformed_vertex_raises_agtypeerror_or_recovers(self):
"""Issue #2367: Malformed agtype must raise AGTypeError or recover gracefully."""
from age.exceptions import AGTypeError
Expand Down