From f284f6a41ba4de19a18dff6bde7ad8b2cba0f3ba Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 28 Nov 2003 10:28:21 +0000 Subject: * hash.c (env_has_value, env_index): must match exactly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5052 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ hash.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8bf6e96781..68dcf3711f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Nov 28 19:28:18 2003 Nobuyoshi Nakada + + * hash.c (env_has_value, env_index): must match exactly. + Fri Nov 28 17:59:20 2003 NAKAMURA Usaku * test/ruby/test_env.rb: add tests for ENV. diff --git a/hash.c b/hash.c index 5fe1dbc6ae..102682c0b3 100644 --- a/hash.c +++ b/hash.c @@ -1598,7 +1598,8 @@ env_has_value(dmy, value) while (*env) { char *s = strchr(*env, '='); if (s++) { - if (strncmp(s, RSTRING(value)->ptr, strlen(s)) == 0) { + long len = strlen(s); + if (RSTRING(value)->len == len && strncmp(s, RSTRING(value)->ptr, len) == 0) { FREE_ENVIRON(environ); return Qtrue; } @@ -1621,7 +1622,8 @@ env_index(dmy, value) while (*env) { char *s = strchr(*env, '='); if (s++) { - if (strncmp(s, RSTRING(value)->ptr, strlen(s)) == 0) { + long len = strlen(s); + if (RSTRING(value)->len == len && strncmp(s, RSTRING(value)->ptr, len) == 0) { str = env_str_new(*env, s-*env-1); FREE_ENVIRON(environ); return str; -- cgit v1.2.3