From 7d302e697f213ca0bbee681a632b727da2918e69 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 10 Jun 2016 05:48:38 +0000
Subject: hash.c: ensure NUL-terminated for ENV

* hash.c (get_env_cstr): ensure NUL-terminated.
  [ruby-dev:49655] [Bug #12475]
* string.c (rb_str_fill_terminator): return the pointer to the
  NUL-terminated content.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55345 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 hash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'hash.c')

diff --git a/hash.c b/hash.c
index 503ff174ac..561aa90400 100644
--- a/hash.c
+++ b/hash.c
@@ -2971,7 +2971,7 @@ get_env_cstr(
     if (memchr(var, '\0', RSTRING_LEN(str))) {
 	rb_raise(rb_eArgError, "bad environment variable %s: contains null byte", name);
     }
-    return var;
+    return rb_str_fill_terminator(str, 1); /* ASCII compatible */
 }
 
 #ifdef _WIN32
-- 
cgit v1.2.3