merge revision(s) 08529a61153e5c40f57a65272211357511d6e6db: [Backport #16798]

	Compare environment variable names in those manor [Bug #16798]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67917 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 19 insertions, 3 deletions

diff --git a/hash.c b/hash.c
index e8be71bec3..38440f4b96 100644
--- a/hash.c
+++ b/hash.c
@@ -5652,13 +5652,29 @@ env_invert(void)
     return rb_hash_invert(env_to_hash());
 }
 
+static void
+keylist_delete(VALUE keys, VALUE key)
+{
+    long keylen, elen;
+    const char *keyptr, *eptr;
+    RSTRING_GETMEM(key, keyptr, keylen);
+    for (long i=0; i<RARRAY_LEN(keys); i++) {
+        VALUE e = RARRAY_AREF(keys, i);
+        RSTRING_GETMEM(e, eptr, elen);
+        if (elen != keylen) continue;
+        if (!ENVNMATCH(keyptr, eptr, elen)) continue;
+        rb_ary_delete_at(keys, i);
+        return;
+    }
+}
+
 static int
 env_replace_i(VALUE key, VALUE val, VALUE keys)
 {
+    env_name(key);
     env_aset(Qnil, key, val);
-    if (rb_ary_includes(keys, key)) {
-	rb_ary_delete(keys, key);
-    }
+
+    keylist_delete(keys, key);
     return ST_CONTINUE;
 }