Fixed RD-15094: Json.Reader going in an infinite loop upon parse erro…

…rs (#533)
raw-labs · Nov 14, 2024 · ea943aa · ea943aa
1 parent ca7e531
commit ea943aa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/...i-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/JsonParserNodes.java b/...i-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/JsonParserNodes.java
@@ -439,9 +439,9 @@ public abstract static class ParseStringJsonParserNode extends Node {
     @TruffleBoundary
     static String doParse(Node node, JsonParser parser, @Bind("$node") Node thisNode) {
       try {
-        if (!parser.currentToken().isScalarValue()) {
-          throw new JsonParserTruffleException(
-              "unexpected token: " + parser.currentToken(), thisNode);
+        JsonToken token = parser.currentToken();
+        if (!token.isScalarValue()) {
+          throw new JsonParserTruffleException("unexpected token: " + token, thisNode);
         }
         String v = parser.getText();
         parser.nextToken();

diff --git a/...rc/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/RecordParseJsonNode.java b/...rc/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/RecordParseJsonNode.java
@@ -98,7 +98,8 @@ private Integer getFieldNameIndex(String fieldName) {
 
   @CompilerDirectives.TruffleBoundary
   private void executeWhileLoop(JsonParser parser, BitSet currentBitSet, Object record) {
-    while (currentTokenNode.execute(this, parser) != JsonToken.END_OBJECT) {
+    while (currentTokenNode.execute(this, parser) != JsonToken.END_OBJECT
+        && currentTokenNode.execute(this, parser) != null) {
       String fieldName = currentFieldNode.execute(this, parser);
       Integer index = this.getFieldNameIndex(fieldName);
       nextTokenNode.execute(this, parser); // skip the field name

diff --git a/...main/java/com/rawlabs/snapi/truffle/ast/osr/conditions/OSRListParseJsonConditionNode.java b/...main/java/com/rawlabs/snapi/truffle/ast/osr/conditions/OSRListParseJsonConditionNode.java
@@ -35,7 +35,8 @@ public OSRListParseJsonConditionNode(int parserSlot) {
   @Override
   public Object executeGeneric(VirtualFrame frame) {
     JsonParser parser = (JsonParser) frame.getObject(parserSlot);
-    return currentToken.execute(this, parser) != JsonToken.END_ARRAY;
+    JsonToken token = currentToken.execute(this, parser);
+    return token != JsonToken.END_ARRAY && token != null;
   }
 
   @Override