1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* encoding.c (valid_encoding_name_p): rejects too long encoding

Browse Source 
names.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24424 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-08-06 07:26:49 +00:00
parent 30995c6594
commit a2393c3e53
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,4 +1,7 @@
Thu Aug 6 16:25:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Aug 6 16:26:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (valid_encoding_name_p): rejects too long encoding
names.
* encoding.c (encoding_data_type): typed data. * encoding.c (encoding_data_type): typed data.

14
encoding.c
View File

@ -45,6 +45,9 @@ void rb_enc_init(void);
#define ENCODING_COUNT ENCINDEX_BUILTIN_MAX #define ENCODING_COUNT ENCINDEX_BUILTIN_MAX
#define UNSPECIFIED_ENCODING INT_MAX #define UNSPECIFIED_ENCODING INT_MAX
#define ENCODING_NAMELEN_MAX 63
#define valid_encoding_name_p(name) ((name) && strlen(name) <= ENCODING_NAMELEN_MAX)
#define enc_autoload_p(enc) (!rb_enc_mbmaxlen(enc)) #define enc_autoload_p(enc) (!rb_enc_mbmaxlen(enc))
static int load_encoding(const char *name); static int load_encoding(const char *name);
@ -189,6 +192,7 @@ enc_register_at(int index, const char *name, rb_encoding *encoding)
struct rb_encoding_entry *ent = &enc_table.list[index]; struct rb_encoding_entry *ent = &enc_table.list[index];
VALUE list; VALUE list;
if (!valid_encoding_name_p(name)) return -1;
if (!ent->name) { if (!ent->name) {
ent->name = name = strdup(name); ent->name = name = strdup(name);
} }
@ -384,6 +388,7 @@ enc_alias_internal(const char *alias, int idx)
static int static int
enc_alias(const char *alias, int idx) enc_alias(const char *alias, int idx)
{ {
if (!valid_encoding_name_p(alias)) return -1;
alias = enc_alias_internal(alias, idx); alias = enc_alias_internal(alias, idx);
set_encoding_const(alias, rb_enc_from_index(idx)); set_encoding_const(alias, rb_enc_from_index(idx));
return idx; return idx;
@ -1078,7 +1083,7 @@ rb_filesystem_encoding(void)
snprintf(cp, sizeof cp, "CP%d", AreFileApisANSI() ? GetACP() : GetOEMCP()); snprintf(cp, sizeof cp, "CP%d", AreFileApisANSI() ? GetACP() : GetOEMCP());
enc = rb_enc_find(cp); enc = rb_enc_find(cp);
#elif defined __APPLE__ #elif defined __APPLE__
enc = rb_enc_find("UTF-8"); enc = rb_utf8_encoding();
#else #else
enc = rb_default_external_encoding(); enc = rb_default_external_encoding();
#endif #endif
@ -1290,17 +1295,22 @@ set_encoding_const(const char *name, rb_encoding *enc)
} }
} }
if (!*s) { if (!*s) {
if (s - name > ENCODING_NAMELEN_MAX) return;
valid = 1; valid = 1;
rb_define_const(rb_cEncoding, name, encoding); rb_define_const(rb_cEncoding, name, encoding);
} }
if (!valid || haslower) { if (!valid || haslower) {
int len = strlen(name) + 1; size_t len = s - name;
if (len > ENCODING_NAMELEN_MAX) return;
if (!haslower || !hasupper) { if (!haslower || !hasupper) {
do { do {
if (ISLOWER(*s)) haslower = 1; if (ISLOWER(*s)) haslower = 1;
if (ISUPPER(*s)) hasupper = 1; if (ISUPPER(*s)) hasupper = 1;
} while (*++s && (!haslower || !hasupper)); } while (*++s && (!haslower || !hasupper));
len = s - name;
} }
len += strlen(s);
if (len++ > ENCODING_NAMELEN_MAX) return;
MEMCPY(s = ALLOCA_N(char, len), name, char, len); MEMCPY(s = ALLOCA_N(char, len), name, char, len);
name = s; name = s;
if (!valid) { if (!valid) {