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

rb_str_crypt: do not goto into a branch

Browse Source 
I'm not necessarily against every goto in general, but jumping into a
branch is definitely a bad idea.  Better refactor.
This commit is contained in:
卜部昌平 2020-06-18 16:52:17 +09:00
parent a5ae9aebbc
commit e3d821a36c
Notes: git 2020-06-29 11:06:45 +09:00 
Merged: https://github.com/ruby/ruby/pull/3247
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
string.c
View File

@ -9645,8 +9645,7 @@ rb_str_crypt(VALUE str, VALUE salt)
mustnot_wchar(str); mustnot_wchar(str);
mustnot_wchar(salt); mustnot_wchar(salt);
if (RSTRING_LEN(salt) < 2) { if (RSTRING_LEN(salt) < 2) {
short_salt: goto short_salt;
rb_raise(rb_eArgError, "salt too short (need >=2 bytes)");
} }
s = StringValueCStr(str); s = StringValueCStr(str);
@ -9677,6 +9676,9 @@ rb_str_crypt(VALUE str, VALUE salt)
result = rb_str_new_cstr(res); result = rb_str_new_cstr(res);
CRYPT_END(); CRYPT_END();
return result; return result;
short_salt:
rb_raise(rb_eArgError, "salt too short (need >=2 bytes)");
} }