Empty ListExpression#genCode will throw npe (#1063)

* fix and ut * change --------- Co-authored-by: 陈亚东 <[email protected]>
apache · Nov 3, 2023 · fa2787a · fa2787a
1 parent 694f7a6
commit fa2787a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/java/fury-core/src/main/java/io/fury/codegen/Expression.java b/java/fury-core/src/main/java/io/fury/codegen/Expression.java
@@ -172,6 +172,10 @@ public TypeToken<?> type() {
 
     @Override
     public ExprCode doGenCode(CodegenContext ctx) {
+      if (last == null) {
+        return new ExprCode(null, null, null);
+      }
+
       StringBuilder codeBuilder = new StringBuilder();
       boolean hasCode = false;
       for (Expression expr : expressions) {

diff --git a/java/fury-core/src/test/java/io/fury/codegen/ExpressionTest.java b/java/fury-core/src/test/java/io/fury/codegen/ExpressionTest.java
@@ -17,7 +17,9 @@
 package io.fury.codegen;
 
 import static io.fury.type.TypeUtils.PRIMITIVE_SHORT_TYPE;
+import static org.testng.Assert.assertNull;
 
+import io.fury.codegen.Expression.ListExpression;
 import io.fury.codegen.Expression.Literal;
 import io.fury.codegen.Expression.Reference;
 import io.fury.codegen.Expression.Return;
@@ -64,4 +66,13 @@ public void testIfExpression() {
       Assert.assertEquals(code, expected);
     }
   }
+
+  @Test
+  public void testListExpression() {
+    {
+      ListExpression exp = new ListExpression();
+      String code = exp.genCode(new CodegenContext()).code();
+      assertNull(code);
+    }
+  }
 }