elf_utils 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbf65536445ceb5a50fd33bb13227ee00837dde499a258a7e9004b3fc9a9716b
-  data.tar.gz: bc21c9017ecabe98263976c14cde0469a1da4c4bf1abca148d96b7eafdb31541
+  metadata.gz: ca6fa495dbda4f982713d3cd015abe94c0a292f0cfcf44a91cc13aeef85a4429
+  data.tar.gz: 6bbfb945c6cb8240f71f92c2b0db81f8df94c8837f76d9adc1a52613781ce663
 SHA512:
-  metadata.gz: 5c976e5b1da62c450aff9448c6b4c5b3984819538d6973179a594cfdf1209805821530d9b7fe61389f064287a7dab28e33635306791e895eae005efe6d279d0b
-  data.tar.gz: c0db80808986319a171ca5f0452369668baa9cef8085fe38e9a76957dd54d79edf1960fd4d9fc7b2100d7793ee7b501150cf5c7b3fb700c1f2ac2a19b3f93894
+  metadata.gz: c0ed80f8d44d903cc4aa5835612b1bd9e6930643a7f5f371589caad5f97564832b90458fdb4628524dfb0f9a68f27ef8ee10d8098aedbf4e86a6220b6be04691
+  data.tar.gz: 3458490318399305bbefe45d957af6b4f4e8d2bb2b7a23f52efba27fb62c238d3ed69ef7f4c3909cf4bc28736fee6abd627ced01a868a1186fb2274c616e8034

data/README.md

@@ -2,7 +2,7 @@
 
 [![Version](https://img.shields.io/gem/v/elf_utils.svg)](https://rubygems.org/gems/elf_utils)
 [![GitHub](https://img.shields.io/badge/github-elf__utils-blue.svg)](http://github.com/cisco-open/ruby-elf_utils)
-[![Documentation](https://img.shields.io/badge/docs-rdoc.info-blue.svg)](http://rubydoc.org/gems/ruby-elf_utils/frames)
+[![Documentation](https://img.shields.io/badge/docs-rdoc.info-blue.svg)](https://rubydoc.info/gems/elf_utils/frames)
 
 [![Contributor-Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-fbab2c.svg)](CODE_OF_CONDUCT.md)
 [![Maintainer](https://img.shields.io/badge/Maintainer-Cisco-00bceb.svg)](https://opensource.cisco.com)

data/elf_utils.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
-  spec.add_dependency "ctypes", "~> 0.2"
+  spec.add_dependency "ctypes", "~> 0.3"
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

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/symbol.rb

@@ -88,11 +88,12 @@ module ElfUtils
       return nil unless type == :object && (debug_info = @file.debug_info)
 
       name = self.name
-      addr = self.addr
+      # use st_value because #addr may be relocated
+      location = @sym.st_value
       die = debug_info.dies(top: true).find do |die|
         die.tag == :variable &&
           die[:name] == name &&
-          die.location == addr
+          die.location == location
       end or return nil
       die[:type]&.ctype
     end

data/lib/elf_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elf_utils
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - David M. Lary
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-24 00:00:00.000000000 Z
+date: 2025-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ctypes
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 description:
 email:
 - dmlary@gmail.com