elf_utils 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 478f9074bd476ac8ef285d6c29495d396f94c8c9065d4877a7e03a65d3560aed
-  data.tar.gz: 1a64b2adfbc19b1a8d2b8a975b516e9d5051a785be8a2f20ec69736eef555ca9
+  metadata.gz: ca6fa495dbda4f982713d3cd015abe94c0a292f0cfcf44a91cc13aeef85a4429
+  data.tar.gz: 6bbfb945c6cb8240f71f92c2b0db81f8df94c8837f76d9adc1a52613781ce663
 SHA512:
-  metadata.gz: 0d651326a749d4cc5daf9b272824dd19d4547438e4313bc366549ad80d329c2de8077851eb4099a1ae0f03d0f17eb3fd943bbc19fc443a954e6c9bd1a6be0aae
-  data.tar.gz: fe4eecc606cef5dded6e1e2178c0f3630b82943a433ca6503fb99e0afa269e1ab020dd3c8af402e2270f6780f029e8fcdd06efa5bc146fa759b189765b7e8581
+  metadata.gz: c0ed80f8d44d903cc4aa5835612b1bd9e6930643a7f5f371589caad5f97564832b90458fdb4628524dfb0f9a68f27ef8ee10d8098aedbf4e86a6220b6be04691
+  data.tar.gz: 3458490318399305bbefe45d957af6b4f4e8d2bb2b7a23f52efba27fb62c238d3ed69ef7f4c3909cf4bc28736fee6abd627ced01a868a1186fb2274c616e8034

data/lib/elf_utils/section/debug_info/die.rb

@@ -137,15 +137,28 @@ module ElfUtils
       @attrs ||= parse_attrs
 
       raise "not a subrange DIE: %p" % [self] unless @tag == :subrange_type
-      return @attrs[:count] if @attrs.has_key?(:count)
+      count = @attrs[:count]
+      case count
+      when Integer
+        return count
+      when Section::DebugInfo::Die
+        # return a size of nil for variable-length array
+        return nil if count.tag == :variable
+        raise ElfUtils::Error, "unexpected DIE type in subrange[:count]: %p" %
+          [count] 
+      when nil
+        # fall through when there is no count attribute
+      else
+        raise ElfUtils::Error, "unexpected value in subrange[:count]: %p" %
+          [count]
+      end
 
       # upper bound may be DW_TAG_variable, so special handling
       if (upper_bound = @attrs[:upper_bound])
         return @attrs[:upper_bound] + 1 if upper_bound.is_a?(Integer)
       end
 
-      # XXX we'll need to do some work to support flexible array members, or
-      # arrays with an upper bound defined by DW_TAG_variable
+      # XXX we'll need to do some work to support flexible array members
       0
     end
 
@@ -173,12 +186,19 @@ module ElfUtils
         when :const_type
           "const #{@attrs[:type]&.type_name || "void"}"
         when :array_type
-          sizes = children
-            .inject("") do |buf, child|
-              buf << "[%d]" % child.subrange_len if child.tag == :subrange_type
-              buf
+          buf = "#{@attrs[:type]&.type_name}"
+          sizes = children.each do |child|
+              next unless child.tag == :subrange_type
+
+              # subrange_len may return nil for variable-length arrays
+              len = child.subrange_len
+              if len
+                buf << "[%d]" % len
+              else
+                buf << "[]"
+              end
             end
-          "#{@attrs[:type].type_name}#{sizes}"
+          buf
         when :pointer_type
           inner = @attrs[:type]&.type_name || "void"
           if inner.end_with?("*")
@@ -221,8 +241,10 @@ module ElfUtils
       when :pointer_type, :subroutine_type
         @cu.addr_type
       when :array_type
+        # subrange_len may return nil for variable-length arrays
         sizes = children
-          .filter_map { |c| c.subrange_len if c.tag == :subrange_type }
+          .select { |c| c.tag == :subrange_type }
+          .map { |c| c.subrange_len }
 
         # if we have a signed char array, we'll use a string to hold it
         inner_type = @attrs[:type].ctype
@@ -232,7 +254,7 @@ module ElfUtils
           inner_type = CTypes::String.new(size: sizes.pop)
         end
 
-        while (size = sizes.pop)
+        sizes.reverse_each do |size|
           inner_type = CTypes::Array.new(type: inner_type, size:)
         end
 

data/lib/elf_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ElfUtils
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elf_utils
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - David M. Lary