summaryrefslogtreecommitdiff
path: root/3rdparty
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-07-21 11:34:35 -0300
committershennetsind <ind@henn.et>2013-07-21 11:34:35 -0300
commite3fd7cc88828865aa94ad00a2e2301a1d44e0831 (patch)
tree571b7abc97e0740f324cdf1cbab532a18084b05f /3rdparty
parenta76709480b8300c7af955f5c2c85d2039c1ee919 (diff)
parent760faf643731de9d38623dce4d129375801f8b33 (diff)
downloadhercules-e3fd7cc88828865aa94ad00a2e2301a1d44e0831.tar.gz
hercules-e3fd7cc88828865aa94ad00a2e2301a1d44e0831.tar.bz2
hercules-e3fd7cc88828865aa94ad00a2e2301a1d44e0831.tar.xz
hercules-e3fd7cc88828865aa94ad00a2e2301a1d44e0831.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to '3rdparty')
-rw-r--r--3rdparty/libconfig/libconfig.c2
-rw-r--r--3rdparty/libconfig/scanner.c2
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,