hash.c: fix dangling pointer

nobu · nobu · commit 7eeaf208b484 · 2014-06-25T22:43:23.000Z
* hash.c (env_name): also store a coerced string to get rid of a
  dangling pointer.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/hash.c b/hash.c
@@ -2547,14 +2547,16 @@ env_str_new2(const char *ptr)
      rb_raise(rb_eArgError, "bad environment variable " #var) : (void)0)
 
 static inline const char *
-env_name(VALUE s)
+env_name(volatile VALUE *s)
 {
     const char *name;
-    SafeStringValue(s);
-    get_env_ptr(name, s);
+    SafeStringValue(*s);
+    get_env_ptr(name, *s);
     return name;
 }
 
+#define env_name(s) env_name(&(s))
+
 static VALUE
 env_delete(VALUE obj, VALUE name)
 {

Original file line number	Diff line number	Diff line change
`@@ -2547,14 +2547,16 @@ env_str_new2(const char *ptr)`
`2547`	`2547`	`rb_raise(rb_eArgError, "bad environment variable " #var) : (void)0)`
`2548`	`2548`
`2549`	`2549`	`static inline const char *`
`2550`		`-env_name(VALUE s)`
	`2550`	`+env_name(volatile VALUE *s)`
`2551`	`2551`	`{`
`2552`	`2552`	`const char *name;`
`2553`		`- SafeStringValue(s);`
`2554`		`- get_env_ptr(name, s);`
	`2553`	`+ SafeStringValue(*s);`
	`2554`	`+ get_env_ptr(name, *s);`
`2555`	`2555`	`return name;`
`2556`	`2556`	`}`
`2557`	`2557`
	`2558`	`+#define env_name(s) env_name(&(s))`
	`2559`	`+`
`2558`	`2560`	`static VALUE`
`2559`	`2561`	`env_delete(VALUE obj, VALUE name)`
`2560`	`2562`	`{`