Skip to content

Commit

Permalink
Merge pull request #2792 from cremno/let-the-c-compiler-validate-the-…
Browse files Browse the repository at this point in the history
…identifier

let the C compiler validate the identifier
  • Loading branch information
matz committed May 17, 2015
2 parents 0cae5ea + 406fb9c commit cf070b6
Showing 1 changed file with 1 addition and 17 deletions.
18 changes: 1 addition & 17 deletions src/dump.c
Expand Up @@ -1019,22 +1019,6 @@ mrb_dump_irep_binary(mrb_state *mrb, mrb_irep *irep, uint8_t flags, FILE* fp)
return result;
}

static mrb_bool
is_valid_c_symbol_name(const char *name)
{
const char *c = NULL;

if (name == NULL || name[0] == '\0') return FALSE;
if (!ISALPHA(name[0]) && name[0] != '_') return FALSE;

c = &name[1];
for (; *c != '\0'; ++c) {
if (!ISALNUM(*c) && *c != '_') return FALSE;
}

return TRUE;
}

static mrb_bool
dump_bigendian_p(uint8_t flags)
{
Expand All @@ -1056,7 +1040,7 @@ mrb_dump_irep_cfunc(mrb_state *mrb, mrb_irep *irep, uint8_t flags, FILE *fp, con
size_t bin_size = 0, bin_idx = 0;
int result;

if (fp == NULL || initname == NULL || !is_valid_c_symbol_name(initname)) {
if (fp == NULL || initname == NULL || initname[0] == '\0') {
return MRB_DUMP_INVALID_ARGUMENT;
}
flags = dump_flags(flags, FLAG_BYTEORDER_NATIVE);
Expand Down

0 comments on commit cf070b6

Please sign in to comment.