#20 fixed NPE in DSL builder if a bit field in a base class defined without outBitNumber

Author: raydac

jbbp/src/main/java/com/igormaznitsa/jbbp/utils/JBBPDslBuilder.java

@@ -1933,7 +1933,13 @@ String getName() {
     }
 
     JBBPBitNumber getBitNumber(final BinField field) {
-      return field.bin.outBitNumber() == JBBPBitNumber.BITS_8 ? this.bin.outBitNumber() : field.bin.outBitNumber();
+      final JBBPBitNumber result;
+      if (field.bin.outBitNumber() == JBBPBitNumber.BITS_8) {
+        result = this.bin == null ? JBBPBitNumber.BITS_8 : this.bin.outBitNumber();
+      } else {
+        result = field.bin.outBitNumber();
+      }
+      return result;
     }
   }
 

jbbp/src/test/java/com/igormaznitsa/jbbp/utils/JBBPDslBuilderTest.java

@@ -1,9 +1,12 @@
 package com.igormaznitsa.jbbp.utils;
 
+import com.igormaznitsa.jbbp.JBBPParser;
 import com.igormaznitsa.jbbp.io.JBBPBitNumber;
 import com.igormaznitsa.jbbp.io.JBBPByteOrder;
 import com.igormaznitsa.jbbp.mapper.Bin;
 import com.igormaznitsa.jbbp.mapper.BinType;
+import com.igormaznitsa.jbbp.model.JBBPFieldArrayBit;
+import com.igormaznitsa.jbbp.model.JBBPFieldStruct;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.function.Executable;
 
@@ -495,6 +498,21 @@ class Internal {
     assertEquals("Test{int a;<int b;int c;d[a+b]{short a;short[8] b;}}", Begin().AnnotatedClass(Test.class).End());
   }
 
+  @Test
+  public void testReportedIssue_20_NPEforOutBitNumber() throws Exception {
+    class BreakJBBPDslBuilder {
+      @Bin(outOrder = 1, comment = "Reserved", type = BinType.BIT_ARRAY, extra = "4")
+      public byte[] reserved;
+    }
+
+    final String dsl = Begin().AnnotatedClass(BreakJBBPDslBuilder.class).End();
+
+    assertEquals("BreakJBBPDslBuilder{bit:8[4] reserved;}", dsl);
+
+    JBBPFieldStruct struct = JBBPParser.prepare(dsl).parse(new byte[] {1, 2, 3, 4});
+    assertArrayEquals(new byte[] {1, 2, 3, 4}, struct.findFieldForType(JBBPFieldStruct.class).findFieldForType(JBBPFieldArrayBit.class).getArray());
+  }
+
   @Test
   public void testAnotatedClass_AnnottatedAllTypes() {
     class Test {