summaryrefslogtreecommitdiff
path: root/ext/readline
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-12-24 20:06:32 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-12-24 20:06:32 +0000
commit76940d8a763a45defd36a26bec4159c500d026e4 (patch)
treedcb470ea28150336a808c7afc23407f17109f83e /ext/readline
parent58d3ef7778a1bfb9116f282f9cc70224cd943217 (diff)
merge revision(s) 60071: [Backport #13953] [Backport #13954] [Backport #13955] [Backport #13957]
ext: check if null byte is contained [ruby-dev:50267] [Bug #13953] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@61456 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/readline')
-rw-r--r--ext/readline/readline.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 7356b7f299..8c6740311b 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -92,7 +92,8 @@ static char **readline_attempted_completion_function(const char *text,
int start, int end);
#define OutputStringValue(str) do {\
- SafeStringValue(str);\
+ StringValueCStr(str);\
+ rb_check_safe_obj(str);\
(str) = rb_str_conv_enc((str), rb_enc_get(str), rb_locale_encoding());\
} while (0)\