From e2479cc43febe9cf26093fa2103a199d2d245711 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 22 Dec 2017 01:03:17 +0000 Subject: encoding.c: rb_enc_find_index2 * string.c (str_undump): use rb_enc_find_index2 to find encoding by unterminated string. check the format before encoding name. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- encoding.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'encoding.c') diff --git a/encoding.c b/encoding.c index 68871db268..2043a69598 100644 --- a/encoding.c +++ b/encoding.c @@ -724,6 +724,17 @@ rb_enc_find_index(const char *name) return i; } +int +rb_enc_find_index2(const char *name, long len) +{ + char buf[ENCODING_NAMELEN_MAX+1]; + + if (len > ENCODING_NAMELEN_MAX) return -1; + memcpy(buf, name, len); + buf[len] = '\0'; + return rb_enc_find_index(buf); +} + rb_encoding * rb_enc_find(const char *name) { -- cgit v1.2.3