Fix NPE in IonRawBinaryWriter (#574)

amazon-ion · Sep 18, 2023 · 4781fdd · 4781fdd
1 parent 0a4b60e
commit 4781fdd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -586,6 +586,7 @@ public void setTypeAnnotationSymbols(final SymbolToken... annotations)
         {
             for (final SymbolToken annotation : annotations)
             {
+                if (annotation == null) break;
                 addTypeAnnotationSymbol(annotation.getSid());
             }
         }

diff --git a/test/com/amazon/ion/impl/bin/IonRawBinaryWriterTest.java b/test/com/amazon/ion/impl/bin/IonRawBinaryWriterTest.java
@@ -425,6 +425,13 @@ public void testSetAnnotations() throws Exception
         assertValue("name::version::'''foobar'''");
     }
 
+    @Test
+    public void testSetTypeAnnotationSymbolsWithNullInArray() throws IOException {
+        writer.setTypeAnnotationSymbols(systemSymbol(NAME_SID), null);
+        writer.writeBool(true);
+        assertValue("name::true");
+    }
+
     @Test
     public void testList() throws Exception
     {