1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Preserve encoding in error messages for invalid user/group name

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2020-04-16 20:40:53 +09:00
parent 748c7c7c0b
commit fedc8075fe
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
process.c
View File

@ -5585,7 +5585,7 @@ obj2uid(VALUE id
#ifndef USE_GETPWNAM_R #ifndef USE_GETPWNAM_R
endpwent(); endpwent();
#endif #endif
rb_raise(rb_eArgError, "can't find user for %s", usrname); rb_raise(rb_eArgError, "can't find user for %"PRIsVALUE, id);
} }
uid = pwptr->pw_uid; uid = pwptr->pw_uid;
#ifndef USE_GETPWNAM_R #ifndef USE_GETPWNAM_R
@ -5664,7 +5664,7 @@ obj2gid(VALUE id
#if !defined(USE_GETGRNAM_R) && defined(HAVE_ENDGRENT) #if !defined(USE_GETGRNAM_R) && defined(HAVE_ENDGRENT)
endgrent(); endgrent();
#endif #endif
rb_raise(rb_eArgError, "can't find group for %s", grpname); rb_raise(rb_eArgError, "can't find group for %"PRIsVALUE, id);
} }
gid = grptr->gr_gid; gid = grptr->gr_gid;
#if !defined(USE_GETGRNAM_R) && defined(HAVE_ENDGRENT) #if !defined(USE_GETGRNAM_R) && defined(HAVE_ENDGRENT)

6
test/ruby/test_process.rb
View File

@ -1610,6 +1610,9 @@ class TestProcess < Test::Unit::TestCase
if u = Etc.getpwuid(Process.uid) if u = Etc.getpwuid(Process.uid)
assert_equal(Process.uid, Process::UID.from_name(u.name), u.name) assert_equal(Process.uid, Process::UID.from_name(u.name), u.name)
end end
assert_raise_with_message(ArgumentError, /\u{4e0d 5b58 5728}/) {
Process::UID.from_name("\u{4e0d 5b58 5728}")
}
end end
end end
@ -1618,6 +1621,9 @@ class TestProcess < Test::Unit::TestCase
if g = Etc.getgrgid(Process.gid) if g = Etc.getgrgid(Process.gid)
assert_equal(Process.gid, Process::GID.from_name(g.name), g.name) assert_equal(Process.gid, Process::GID.from_name(g.name), g.name)
end end
assert_raise_with_message(ArgumentError, /\u{4e0d 5b58 5728}/) {
Process::GID.from_name("\u{4e0d 5b58 5728}")
}
end end
end end