sass-embedded 1.83.4-x64-mingw32 → 1.85.0-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4269ead9530643a3259c865f9a5eb48b6635aa32738d47cc296eefc43b5deff6
-  data.tar.gz: 587f4ea78fc07ab8d5d3f1fe60e97ce1af2425cce549273cbceb3bae27f1f646
+  metadata.gz: cf20323e0ca824dafab5095cd5cb6e51e31964f7fa8e3c4a06ec4b7af862dac9
+  data.tar.gz: f54ac85a015c116a7c0a4904bd0e71ef3ff14babdf1ead515b7e6af05f082317
 SHA512:
-  metadata.gz: 34ac1a9901e5819e26ea9a9321b1066ebb5728dc9c33feb99f160f15dd8e79f0af6c3349570284aafe4b591426ed168f875b0a65234657ec3e03c0a4e33a947f
-  data.tar.gz: 8fca8338e4f46252147d4993b13f4af1af0122ab2ae1e6acb2b64aa94383be61e5413dbb7d2d4adfbee8ef77b00f40a19d085edfbc43e4cba76849745e5d5c98
+  metadata.gz: d1fb407583f8ae10dc5a70208c4574ffbe36fe705efde4d0df8ef625984a43c50b11100f40e85dc39f91f5c4b72259d22454c310c65f1958a382aabedd68d328
+  data.tar.gz: 00d93a19c5f96cfc55879cf3676a9db6e4015690e23ef4d9f991827174aa74edb6e6444f37fa7a1b404f41e7dcea10862b17f7000e48b4c224c731be0a521772

data/lib/sass/elf.rb

@@ -7,73 +7,30 @@ module Sass
   # @see https://github.com/torvalds/linux/blob/HEAD/include/uapi/linux/elf.h
   # @see https://github.com/torvalds/linux/blob/HEAD/kernel/kexec_elf.c
   class ELF
-    module PackInfo
-      PACK_MAP = {
-        Elf32_Ehdr: 'S<2L<5S<6',
-        Elf64_Ehdr: 'S<2L<Q<3L<S<6',
-        Elf32_Phdr: 'L<8',
-        Elf64_Phdr: 'L<2Q<6'
-      }.freeze
-
-      SIZE_MAP = {
-        Elf32_Ehdr: 36,
-        Elf64_Ehdr: 48,
-        Elf32_Phdr: 32,
-        Elf64_Phdr: 56
-      }.freeze
-
-      STRUCT_MAP = {
-        Elf32_Ehdr: %i[
-          e_type
-          e_machine
-          e_version
-          e_entry
-          e_phoff
-          e_shoff
-          e_flags
-          e_ehsize
-          e_phentsize
-          e_phnum
-          e_shentsize
-          e_shnum
-          e_shstrndx
-        ].freeze,
-        Elf64_Ehdr: %i[
-          e_type
-          e_machine
-          e_version
-          e_entry
-          e_phoff
-          e_shoff
-          e_flags
-          e_ehsize
-          e_phentsize
-          e_phnum
-          e_shentsize
-          e_shnum
-          e_shstrndx
-        ].freeze,
-        Elf32_Phdr: %i[
-          p_type
-          p_offset
-          p_vaddr
-          p_paddr
-          p_filesz
-          p_memsz
-          p_flags
-          p_align
-        ].freeze,
-        Elf64_Phdr: %i[
-          p_type
-          p_flags
-          p_offset
-          p_vaddr
-          p_paddr
-          p_filesz
-          p_memsz
-          p_align
-        ].freeze
-      }.freeze
+    # The {PackInfo} class.
+    class PackInfo
+      def initialize(format:, sizeof:, struct:)
+        @format_le = format.freeze
+        @format_be = format.tr('<', '>').freeze
+        @sizeof = sizeof.freeze
+        @struct = struct.freeze
+      end
+
+      attr_reader :sizeof
+
+      def pack(io, data, little_endian)
+        raise ArgumentError if io.write(data.values_at(*@struct).pack(format(little_endian))) != @sizeof
+      end
+
+      def unpack(io, little_endian)
+        @struct.zip(io.read(@sizeof).unpack(format(little_endian))).to_h
+      end
+
+      private
+
+      def format(little_endian)
+        little_endian ? @format_le : @format_be
+      end
     end
 
     private_constant :PackInfo
@@ -92,6 +49,8 @@ module Sass
     PT_LOPROC       = 0x70000000
     PT_HIPROC       = 0x7fffffff
 
+    PN_XNUM         = 0xffff
+
     # These constants define the different elf file types
     ET_NONE   = 0
     ET_REL    = 1
@@ -103,6 +62,154 @@ module Sass
 
     EI_NIDENT = 16
 
+    Elf32_Ehdr = PackInfo.new(
+      format: "a#{EI_NIDENT}S<2L<5S<6",
+      sizeof: 52,
+      struct: %i[
+        e_ident
+        e_type
+        e_machine
+        e_version
+        e_entry
+        e_phoff
+        e_shoff
+        e_flags
+        e_ehsize
+        e_phentsize
+        e_phnum
+        e_shentsize
+        e_shnum
+        e_shstrndx
+      ]
+    ).freeze
+
+    Elf64_Ehdr = PackInfo.new(
+      format: "a#{EI_NIDENT}S<2L<Q<3L<S<6",
+      sizeof: 64,
+      struct: %i[
+        e_ident
+        e_type
+        e_machine
+        e_version
+        e_entry
+        e_phoff
+        e_shoff
+        e_flags
+        e_ehsize
+        e_phentsize
+        e_phnum
+        e_shentsize
+        e_shnum
+        e_shstrndx
+      ]
+    ).freeze
+
+    # These constants define the permissions on sections in the program header, p_flags.
+    PF_R = 0x4
+    PF_W = 0x2
+    PF_X = 0x1
+
+    Elf32_Phdr = PackInfo.new(
+      format: 'L<8',
+      sizeof: 32,
+      struct: %i[
+        p_type
+        p_offset
+        p_vaddr
+        p_paddr
+        p_filesz
+        p_memsz
+        p_flags
+        p_align
+      ]
+    ).freeze
+
+    Elf64_Phdr = PackInfo.new(
+      format: 'L<2Q<6',
+      sizeof: 56,
+      struct: %i[
+        p_type
+        p_flags
+        p_offset
+        p_vaddr
+        p_paddr
+        p_filesz
+        p_memsz
+        p_align
+      ]
+    ).freeze
+
+    # sh_type
+    SHT_NULL     = 0
+    SHT_PROGBITS = 1
+    SHT_SYMTAB   = 2
+    SHT_STRTAB   = 3
+    SHT_RELA     = 4
+    SHT_HASH     = 5
+    SHT_DYNAMIC  = 6
+    SHT_NOTE     = 7
+    SHT_NOBITS   = 8
+    SHT_REL      = 9
+    SHT_SHLIB    = 10
+    SHT_DYNSYM   = 11
+    SHT_NUM      = 12
+    SHT_LOPROC   = 0x70000000
+    SHT_HIPROC   = 0x7fffffff
+    SHT_LOUSER   = 0x80000000
+    SHT_HIUSER   = 0xffffffff
+
+    # sh_flags
+    SHF_WRITE          = 0x1
+    SHF_ALLOC          = 0x2
+    SHF_EXECINSTR      = 0x4
+    SHF_RELA_LIVEPATCH = 0x00100000
+    SHF_RO_AFTER_INIT  = 0x00200000
+    SHF_MASKPROC       = 0xf0000000
+
+    # special section indexes
+    SHN_UNDEF     = 0
+    SHN_LORESERVE = 0xff00
+    SHN_LOPROC    = 0xff00
+    SHN_HIPROC    = 0xff1f
+    SHN_LIVEPATCH = 0xff20
+    SHN_ABS       = 0xfff1
+    SHN_COMMON    = 0xfff2
+    SHN_HIRESERVE = 0xffff
+
+    Elf32_Shdr = PackInfo.new(
+      format: 'L<10',
+      sizeof: 40,
+      struct: %i[
+        sh_name
+        sh_type
+        sh_flags
+        sh_addr
+        sh_offset
+        sh_size
+        sh_link
+        sh_info
+        sh_addralign
+        sh_entsize
+      ]
+    ).freeze
+
+    Elf64_Shdr = PackInfo.new(
+      format: 'L<2Q<4L<2Q<2',
+      sizeof: 64,
+      struct: %i[
+        sh_name
+        sh_type
+        sh_flags
+        sh_addr
+        sh_offset
+        sh_size
+        sh_link
+        sh_info
+        sh_addralign
+        sh_entsize
+      ]
+    ).freeze
+
     # e_ident[] indexes
     EI_MAG0    = 0
     EI_MAG1    = 1
@@ -133,24 +240,84 @@ module Sass
     ELFDATA2LSB = 1
     ELFDATA2MSB = 2
 
-    def initialize(buffer)
-      @buffer = buffer
+    def initialize(io, program_headers: true, section_headers: false)
+      io.rewind
+      e_ident = io.read(EI_NIDENT).unpack('C*')
+      raise ArgumentError unless e_ident.slice(EI_MAG0, SELFMAG).pack('C*') == ELFMAG
+
+      case e_ident[EI_CLASS]
+      when ELFCLASS32
+        elf_ehdr = Elf32_Ehdr
+        elf_phdr = Elf32_Phdr
+        elf_shdr = Elf32_Shdr
+      when ELFCLASS64
+        elf_ehdr = Elf64_Ehdr
+        elf_phdr = Elf64_Phdr
+        elf_shdr = Elf64_Shdr
+      else
+        raise EncodingError
+      end
+
+      case e_ident[EI_DATA]
+      when ELFDATA2LSB
+        little_endian = true
+      when ELFDATA2MSB
+        little_endian = false
+      else
+        raise EncodingError
+      end
+
+      io.rewind
+      ehdr = elf_ehdr.unpack(io, little_endian)
+      ehdr[:e_ident] = e_ident
 
-      @ehdr = { e_ident: @buffer.read(EI_NIDENT).unpack('C*') }
-      raise ArgumentError unless @ehdr[:e_ident].slice(EI_MAG0, SELFMAG).pack('C*') == ELFMAG
+      phdrs = if program_headers && ehdr[:e_phnum].positive?
+                io.seek(ehdr[:e_phoff], IO::SEEK_SET)
+                Array.new(ehdr[:e_phnum]) do
+                  elf_phdr.unpack(io, little_endian)
+                end
+              else
+                []
+              end
 
-      case @ehdr[:e_ident][EI_CLASS]
+      shdrs = if section_headers && ehdr[:e_shnum].positive?
+                io.seek(ehdr[:e_shoff], IO::SEEK_SET)
+                Array.new(ehdr[:e_shnum]) do
+                  elf_shdr.unpack(io, little_endian)
+                end
+              else
+                []
+              end
+
+      @io = io
+      @ehdr = ehdr
+      @phdrs = phdrs
+      @shdrs = shdrs
+    end
+
+    def dump(io)
+      e_ident = @ehdr[:e_ident]
+      raise ArgumentError unless e_ident.slice(EI_MAG0, SELFMAG).pack('C*') == ELFMAG
+
+      ehdr = @ehdr.dup
+      ehdr[:e_ident] = e_ident.pack('C*')
+      phdrs = @phdrs
+      shdrs = @shdrs
+
+      case e_ident[EI_CLASS]
       when ELFCLASS32
-        elf_ehdr = :Elf32_Ehdr
-        elf_phdr = :Elf32_Phdr
+        elf_ehdr = Elf32_Ehdr
+        elf_phdr = Elf32_Phdr
+        elf_shdr = Elf32_Shdr
       when ELFCLASS64
-        elf_ehdr = :Elf64_Ehdr
-        elf_phdr = :Elf64_Phdr
+        elf_ehdr = Elf64_Ehdr
+        elf_phdr = Elf64_Phdr
+        elf_shdr = Elf64_Shdr
       else
         raise EncodingError
       end
 
-      case @ehdr[:e_ident][EI_DATA]
+      case e_ident[EI_DATA]
       when ELFDATA2LSB
         little_endian = true
       when ELFDATA2MSB
@@ -159,12 +326,20 @@ module Sass
         raise EncodingError
       end
 
-      @ehdr.merge!(read(elf_ehdr, little_endian))
+      io.rewind
+      elf_ehdr.pack(io, ehdr, little_endian)
 
-      @buffer.seek(@ehdr[:e_phoff], IO::SEEK_SET)
-      @proghdrs = Array.new(@ehdr[:e_phnum]) do
-        read(elf_phdr, little_endian)
+      io.seek(ehdr[:e_phoff], IO::SEEK_SET) if (ehdr[:e_phnum]).positive?
+      phdrs.each do |phdr|
+        elf_phdr.pack(io, phdr, little_endian)
       end
+
+      io.seek(ehdr[:e_shoff], IO::SEEK_SET) if (ehdr[:e_shnum]).positive?
+      shdrs.each do |shdr|
+        elf_shdr.pack(io, shdr, little_endian)
+      end
+
+      io.flush
     end
 
     def relocatable?
@@ -184,24 +359,16 @@ module Sass
     end
 
     def interpreter
-      phdr = @proghdrs.find { |p| p[:p_type] == PT_INTERP }
+      phdr = @phdrs.find { |p| p[:p_type] == PT_INTERP }
       return if phdr.nil?
 
-      @buffer.seek(phdr[:p_offset], IO::SEEK_SET)
-      interpreter = @buffer.read(phdr[:p_filesz])
+      @io.seek(phdr[:p_offset], IO::SEEK_SET)
+      interpreter = @io.read(phdr[:p_filesz])
       raise EncodingError unless interpreter.end_with?("\0")
 
       interpreter.chomp!("\0")
     end
 
-    private
-
-    def read(type, little_endian)
-      size = PackInfo::SIZE_MAP[type]
-      format = little_endian ? PackInfo::PACK_MAP[type] : PackInfo::PACK_MAP[type].tr('<', '>')
-      [PackInfo::STRUCT_MAP[type], @buffer.read(size).unpack(format)].transpose.to_h
-    end
-
     INTERPRETER = begin
       proc_self_exe = '/proc/self/exe'
       if File.exist?(proc_self_exe)

data/lib/sass/embedded/version.rb

@@ -2,6 +2,6 @@
 
 module Sass
   module Embedded
-    VERSION = '1.83.4'
+    VERSION = '1.85.0'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sass-embedded
 version: !ruby/object:Gem::Version
-  version: 1.83.4
+  version: 1.85.0
 platform: x64-mingw32
 authors:
 - なつき
 bindir: exe
 cert_chain: []
-date: 2025-01-14 00:00:00.000000000 Z
+date: 2025-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -111,8 +111,8 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/issues
-  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.83.4
-  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.83.4
+  documentation_uri: https://rubydoc.info/gems/sass-embedded/1.85.0
+  source_code_uri: https://github.com/sass-contrib/sass-embedded-host-ruby/tree/v1.85.0
   funding_uri: https://github.com/sponsors/ntkme
   rubygems_mfa_required: 'true'
 rdoc_options: []
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Use dart-sass with Ruby!
 test_files: []