diff options
author | malufett <malufett.eat.my.binaries@gmail.com> | 2013-07-21 21:07:49 +0800 |
---|---|---|
committer | malufett <malufett.eat.my.binaries@gmail.com> | 2013-07-21 21:07:49 +0800 |
commit | 760faf643731de9d38623dce4d129375801f8b33 (patch) | |
tree | 12a748aa89937f240f9c8eba472e58501f94008f /3rdparty/libconfig | |
parent | 8b00d9bd079514a1c307ef5d2e6614055e8f874e (diff) | |
parent | fe946e819d935ca92208e32b6b2766ec92b30601 (diff) | |
download | hercules-760faf643731de9d38623dce4d129375801f8b33.tar.gz hercules-760faf643731de9d38623dce4d129375801f8b33.tar.bz2 hercules-760faf643731de9d38623dce4d129375801f8b33.tar.xz hercules-760faf643731de9d38623dce4d129375801f8b33.zip |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to '3rdparty/libconfig')
-rw-r--r-- | 3rdparty/libconfig/libconfig.c | 2 | ||||
-rw-r--r-- | 3rdparty/libconfig/scanner.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/3rdparty/libconfig/libconfig.c b/3rdparty/libconfig/libconfig.c index 4cc272c9f..e2c583310 100644 --- a/3rdparty/libconfig/libconfig.c +++ b/3rdparty/libconfig/libconfig.c @@ -540,7 +540,7 @@ static int __config_validate_name(const char *name) for(++p; *p; ++p) { - if(! (isalpha((unsigned char)*p) || isdigit((unsigned char)*p) || strchr("*_-", (int)*p))) + if(! (isalpha((unsigned char)*p) || isdigit((unsigned char)*p) || strchr("*_-'", (int)*p))) return(CONFIG_FALSE); } diff --git a/3rdparty/libconfig/scanner.c b/3rdparty/libconfig/scanner.c index c2eb7d188..118fcf8ad 100644 --- a/3rdparty/libconfig/scanner.c +++ b/3rdparty/libconfig/scanner.c @@ -399,7 +399,7 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 4, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 1, 6, 7, 1, 1, 1, 1, 8, + 1, 2, 1, 6, 7, 1, 1, 1, 26, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 17, 17, 17, 17, 17, 17, 17, 17, 18, 19, 1, 20, 1, 1, 21, 22, 23, 23, 23, 24, 25, |