Land #280, Fix two fields in UserProperties

Fixes situations where AES kerberos keys are not present.
rapid7 · Nov 22, 2024 · 8665aa5 · 8665aa5
2 parents af862a1 + a145ef0
commit 8665aa5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/ruby_smb/dcerpc/samr.rb b/lib/ruby_smb/dcerpc/samr.rb
@@ -443,8 +443,8 @@ class UserProperties < BinData::Record
         uint16 :reserved3
         string :reserved4, length: 96
         uint16 :property_signature, initial_value: 0x50
-        uint16 :property_count, initial_value: -> { user_properties.size }
-        array  :user_properties, type: :user_property, initial_length: :property_count
+        uint16 :property_count, initial_value: -> { user_properties.size }, onlyif: -> { struct_length > 111 }
+        array  :user_properties, type: :user_property, initial_length: :property_count, onlyif: :property_count?
         uint8  :reserved5
       end