diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-04 10:15:34 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-04 10:15:34 +0000 |
commit | 61f8b79aee55fe6eb56cc1f68a35ee42675d0320 (patch) | |
tree | a0008d75fa81363442708cdaa98272e426bb8415 /include | |
parent | 970524f9fa95fef27eeb3f218e182cef4065855c (diff) | |
download | ruby-61f8b79aee55fe6eb56cc1f68a35ee42675d0320.tar.gz ruby-61f8b79aee55fe6eb56cc1f68a35ee42675d0320.tar.xz ruby-61f8b79aee55fe6eb56cc1f68a35ee42675d0320.zip |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@19123 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include')
-rw-r--r-- | include/ruby/encoding.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index 10a7b9522..ae1ec13e7 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 */ |