Skip to content
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

Jump to bottom

Fix using System.retry_with_buffer with stack buffer #14615

Merged
merged 2 commits into from
May 29, 2024
Merged

Fix using System.retry_with_buffer with stack buffer #14615

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1dde01
Fix using `System.retry_with_buffer` with stack buffer
straight-shoota May 23, 2024
4bcfae1
Drop unused block argument
straight-shoota May 24, 2024
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
13 changes: 8 additions & 5 deletions src/crystal/system/unix/group.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ module Crystal::System::Group
grp = uninitialized LibC::Group
grp_pointer = pointerof(grp)
System.retry_with_buffer("getgrnam_r", GETGR_R_SIZE_MAX) do |buf|
LibC.getgrnam_r(groupname, grp_pointer, buf, buf.size, pointerof(grp_pointer))
LibC.getgrnam_r(groupname, grp_pointer, buf, buf.size, pointerof(grp_pointer)).tap do |ret|
# It's not necessary to check success with `ret == 0` because `grp_pointer` will be NULL on failure
return from_struct(grp) if grp_pointer
end
end

from_struct(grp) if grp_pointer
end

private def from_id?(groupid : String)
Expand All @@ -27,8 +28,10 @@ module Crystal::System::Group
grp = uninitialized LibC::Group
grp_pointer = pointerof(grp)
System.retry_with_buffer("getgrgid_r", GETGR_R_SIZE_MAX) do |buf|
LibC.getgrgid_r(groupid, grp_pointer, buf, buf.size, pointerof(grp_pointer))
LibC.getgrgid_r(groupid, grp_pointer, buf, buf.size, pointerof(grp_pointer)).tap do |ret|
# It's not necessary to check success with `ret == 0` because `grp_pointer` will be NULL on failure
return from_struct(grp) if grp_pointer
end
end
from_struct(grp) if grp_pointer
end
end
11 changes: 5 additions & 6 deletions src/crystal/system/unix/path.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@ module Crystal::System::Path
pwd_pointer = pointerof(pwd)
ret = nil
System.retry_with_buffer("getpwuid_r", User::GETPW_R_SIZE_MAX) do |buf|
ret = LibC.getpwuid_r(id, pwd_pointer, buf, buf.size, pointerof(pwd_pointer))
ret = LibC.getpwuid_r(id, pwd_pointer, buf, buf.size, pointerof(pwd_pointer)).tap do |ret|
# It's not necessary to check success with `ret == 0` because `pwd_pointer` will be NULL on failure
return String.new(pwd.pw_dir) if pwd_pointer
end
ysbaddaden marked this conversation as resolved.
Show resolved Hide resolved
end

if pwd_pointer
String.new(pwd.pw_dir)
else
raise RuntimeError.from_os_error("getpwuid_r", Errno.new(ret.not_nil!))
end
raise RuntimeError.from_os_error("getpwuid_r", Errno.new(ret.not_nil!))
end
end
end
14 changes: 8 additions & 6 deletions src/crystal/system/unix/user.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ module Crystal::System::User
pwd = uninitialized LibC::Passwd
pwd_pointer = pointerof(pwd)
System.retry_with_buffer("getpwnam_r", GETPW_R_SIZE_MAX) do |buf|
LibC.getpwnam_r(username, pwd_pointer, buf, buf.size, pointerof(pwd_pointer))
LibC.getpwnam_r(username, pwd_pointer, buf, buf.size, pointerof(pwd_pointer)).tap do |ret|
# It's not necessary to check success with `ret == 0` because `pwd_pointer` will be NULL on failure
return from_struct(pwd) if pwd_pointer
end
end

from_struct(pwd) if pwd_pointer
end

private def from_id?(id : String)
Expand All @@ -30,9 +31,10 @@ module Crystal::System::User
pwd = uninitialized LibC::Passwd
pwd_pointer = pointerof(pwd)
System.retry_with_buffer("getpwuid_r", GETPW_R_SIZE_MAX) do |buf|
LibC.getpwuid_r(id, pwd_pointer, buf, buf.size, pointerof(pwd_pointer))
LibC.getpwuid_r(id, pwd_pointer, buf, buf.size, pointerof(pwd_pointer)).tap do |ret|
# It's not necessary to check success with `ret == 0` because `pwd_pointer` will be NULL on failure
return from_struct(pwd) if pwd_pointer
end
end

from_struct(pwd) if pwd_pointer
end
end
Loading