Fix decoding of container data attributes when the contained type doe…

…s not have a definition
aaa4j · Aug 21, 2024 · dae395e · dae395e
1 parent 203dc36
commit dae395e
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/aaa4j-radius-core/src/main/java/org/aaa4j/radius/core/packet/PacketCodec.java b/aaa4j-radius-core/src/main/java/org/aaa4j/radius/core/packet/PacketCodec.java
@@ -545,13 +545,15 @@ private List<Attribute<?>> decodeAttributes(CodecContext codecContext, List<RawA
 
                 AttributeDefinition<?, ?> attributeDefinition = dictionary.getAttributeDefinition(nextType);
 
-                int numComplete = attributeDefinition.getAttributeCodec().decode(codecContext, attributeStack);
+                if (attributeDefinition != null) {
+                    int numComplete = attributeDefinition.getAttributeCodec().decode(codecContext, attributeStack);
 
-                for (int i = 0; i < numComplete; i++) {
-                    attributes.add(attributeStack.removeFirst());
-                }
+                    for (int i = 0; i < numComplete; i++) {
+                        attributes.add(attributeStack.removeFirst());
+                    }
 
-                continue;
+                    continue;
+                }
             }
 
             attributes.add(attributeStack.removeFirst());