Skip to content

mruby-socket: reject a big integer getaddrinfo hint instead of ignoring it #7118

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
matz merged 1 commit into from
Aug 12, 2026
Merged

mruby-socket: reject a big integer getaddrinfo hint instead of ignoring it #7118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 18 additions & 10 deletions mrbgems/mruby-socket/src/socket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,18 @@ free_addrinfo(mrb_state *mrb, mrb_value addrinfo)
* Addrinfo.getaddrinfo("www.example.com", 80, Socket::AF_INET)
*/
static int
getaddrinfo_hint(mrb_state *mrb, mrb_int v, const char *name)
getaddrinfo_hint(mrb_state *mrb, mrb_value val, const char *name)
{
/* getaddrinfo() hint fields are C int; reject values that would not
survive the narrowing rather than silently truncating them (#6960). */
survive the narrowing rather than silently truncating them (#6960).
A big integer outgrows mrb_int itself, so it never fits a C int either. */
if (mrb_bigint_p(val)) {
mrb_raisef(mrb, E_RANGE_ERROR, "getaddrinfo %s out of range: %v", name, val);
}
mrb_int v = mrb_integer(val);
#if MRB_INT_MAX > INT_MAX
if (v < INT_MIN || v > INT_MAX) {
mrb_raisef(mrb, E_RANGE_ERROR, "getaddrinfo %s out of range: %i", name, v);
mrb_raisef(mrb, E_RANGE_ERROR, "getaddrinfo %s out of range: %v", name, val);
}
#endif
return (int)v;
Expand Down Expand Up @@ -223,18 +228,21 @@ mrb_addrinfo_getaddrinfo(mrb_state *mrb, mrb_value klass)
mrb_raise(mrb, E_TYPE_ERROR, "service must be String, Integer, or nil");
}

hints.ai_flags = getaddrinfo_hint(mrb, flags, "flags");
hints.ai_flags = getaddrinfo_hint(mrb, mrb_int_value(mrb, flags), "flags");

if (mrb_integer_p(family)) {
hints.ai_family = getaddrinfo_hint(mrb, mrb_integer(family), "family");
/* an out of range hint reaches here as a big integer wherever bigint is
built in, and `mrb_integer_p` alone would leave the field at its default
rather than report the value as out of range */
if (mrb_integer_p(family) || mrb_bigint_p(family)) {
hints.ai_family = getaddrinfo_hint(mrb, family, "family");
}

if (mrb_integer_p(socktype)) {
hints.ai_socktype = getaddrinfo_hint(mrb, mrb_integer(socktype), "socktype");
if (mrb_integer_p(socktype) || mrb_bigint_p(socktype)) {
hints.ai_socktype = getaddrinfo_hint(mrb, socktype, "socktype");
}

if (mrb_integer_p(protocol)) {
hints.ai_protocol = getaddrinfo_hint(mrb, mrb_integer(protocol), "protocol");
if (mrb_integer_p(protocol) || mrb_bigint_p(protocol)) {
hints.ai_protocol = getaddrinfo_hint(mrb, protocol, "protocol");
}

int error = getaddrinfo(hostname, servname, &hints, &addr);
Expand Down
19 changes: 19 additions & 0 deletions mrbgems/mruby-socket/test/addrinfo.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,25 @@
assert_raise(RangeError) { Addrinfo.getaddrinfo("localhost", nil, nil, nil, nil, 1 << 40) }
end

assert('Addrinfo.getaddrinfo rejects a big integer hint') do
# a hint too wide for mrb_int arrives as a big integer, which used to miss
# the `mrb_integer_p` check and leave the field at its default: the caller
# asked for something unrepresentable and got an unhinted lookup instead
# The shift width comes from a variable because a literal wide shift is
# constant folded, and the fold fails where bigint is absent, dropping every
# test in this file.
shift = 70
big = begin
1 << shift
rescue RangeError
nil
end
skip "needs mruby-bigint" unless big
assert_raise(RangeError) { Addrinfo.getaddrinfo("localhost", nil, big) }
assert_raise(RangeError) { Addrinfo.getaddrinfo("localhost", nil, nil, big) }
assert_raise(RangeError) { Addrinfo.getaddrinfo("localhost", nil, nil, nil, big) }
end

assert('Addrinfo.foreach') do
skip "localhost resolution unreliable in Windows getaddrinfo" if SocketTest.win?
# assume Addrinfo.getaddrinfo works well
Expand Down
Loading