Skip to content

Make pointer size consistent between backends#183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kou merged 2 commits into from
Apr 22, 2025
+18 −1
Merged

Make pointer size consistent between backends #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dde8c9f
Make pointer size consistent between backends
ankane Apr 22, 2025
66203d4
Update lib/fiddle/ffi_backend.rb
ankane Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion lib/fiddle/ffi_backend.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -323,7 +323,13 @@ def initialize(addr, size = nil, free = nil)
FFI::Pointer.new(Integer(addr))
end

@size = size ? size : ptr.size
if size
@size = size
elsif ptr.size_limit?
@size = ptr.size
else
@size = 0
end
@free = free
@ffi_ptr = ptr
@freed = false
Expand DownExpand Up@@ -413,6 +419,8 @@ def to_i
def to_s(len = nil)
if len
ffi_ptr.read_string(len)
elsif @size == 0
ffi_ptr.read_string
else
ffi_ptr.get_string(0, @size)
end
Expand DownExpand Up@@ -486,6 +494,7 @@ def -@
def ref
cptr = Pointer.malloc(FFI::Type::POINTER.size, RUBY_FREE)
cptr.ffi_ptr.put_pointer(0, ffi_ptr)
cptr.size = 0
cptr
end
end
Expand Down
8 changes: 8 additions & 0 deletions test/fiddle/test_pointer.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,9 @@ def test_to_str

ptr[5] = 0
assert_equal "hello\0world", ptr.to_str

ptr.size = 0
assert_equal "", ptr.to_str
end

def test_to_s
Expand All@@ -93,6 +96,9 @@ def test_to_s
ptr[5] = 0
assert_equal 'hello', ptr.to_s
assert_equal "hello\0", ptr.to_s(6)

ptr.size = 0
assert_equal "hello", ptr.to_s
Comment on lines +100 to +101

@eregoneregonApr 24, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at this this, why does ptr.size = 0 have no effect here, but it has on ptr.to_str in the previous test?
Shouldn't ptr.size = 0 change the @size of ptr?

@ankaneankaneApr 24, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the current behavior of CRuby, so the PR mirrors it.

end

def test_minus
Expand DownExpand Up@@ -256,6 +262,8 @@ def test_size
Pointer.malloc(4, Fiddle::RUBY_FREE) do |ptr|
assert_equal 4, ptr.size
end
assert_equal 0, Pointer.new(0).size
assert_equal 0, Pointer.new(0).ref.size
end

def test_size=
Expand Down