summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-04 10:15:34 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-04 10:15:34 +0000
commit45c37073038bde691ef12350277cd5a0b7796ec3 (patch)
treea0008d75fa81363442708cdaa98272e426bb8415 /include
parent1633eb7238776b94a5f162b85f225423174e4c26 (diff)
* include/ruby/encoding.h (ECONV_INVALID_IGNORE): removed because
it tend to cause security problem. If the behaviour is really required, ECONV_INVALID_REPLACE with empty string can be used. For example, CVE-2006-2313, CVE-2008-1036, [ruby-core:15645] (ECONV_UNDEF_IGNORE): ditto. * transcode.c (rb_econv_convert): follow the above change. (econv_opts): ditto. (Init_transcode): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19123 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include')
-rw-r--r--include/ruby/encoding.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h
index 10a7b95229..ae1ec13e74 100644
--- a/include/ruby/encoding.h
+++ b/include/ruby/encoding.h
@@ -251,11 +251,9 @@ void rb_econv_binmode(rb_econv_t *ec);
/* flags for rb_econv_open */
#define ECONV_INVALID_MASK 0x000f
-#define ECONV_INVALID_IGNORE 0x0001
#define ECONV_INVALID_REPLACE 0x0002
#define ECONV_UNDEF_MASK 0x00f0
-#define ECONV_UNDEF_IGNORE 0x0010
#define ECONV_UNDEF_REPLACE 0x0020
/* effective only if output is ascii compatible */