From e3d821a36ce9040542bb3fb8e1fa97df3fd06499 Mon Sep 17 00:00:00 2001
From: 卜部昌平 <shyouhei@ruby-lang.org>
Date: Thu, 18 Jun 2020 16:52:17 +0900
Subject: rb_str_crypt: do not goto into a branch

I'm not necessarily against every goto in general, but jumping into a
branch is definitely a bad idea.  Better refactor.
---
 string.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/string.c b/string.c
index 60ee2a5fa3..c74e8ebbb7 100644
--- a/string.c
+++ b/string.c
@@ -9645,8 +9645,7 @@ rb_str_crypt(VALUE str, VALUE salt)
     mustnot_wchar(str);
     mustnot_wchar(salt);
     if (RSTRING_LEN(salt) < 2) {
-      short_salt:
-	rb_raise(rb_eArgError, "salt too short (need >=2 bytes)");
+        goto short_salt;
     }
 
     s = StringValueCStr(str);
@@ -9677,6 +9676,9 @@ rb_str_crypt(VALUE str, VALUE salt)
     result = rb_str_new_cstr(res);
     CRYPT_END();
     return result;
+
+  short_salt:
+    rb_raise(rb_eArgError, "salt too short (need >=2 bytes)");
 }
 
 
-- 
cgit v1.2.3