From bdd712bc4b94a9a79b1b3ef44b1a9b5dc4b33fd9 Mon Sep 17 00:00:00 2001 From: IntelOrca Date: Thu, 21 May 2015 02:52:32 +0100 Subject: [PATCH] fix config parsing bug --- data/g2.dat | Bin 20666 -> 0 bytes src/config.c | 12 ++++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) delete mode 100644 data/g2.dat diff --git a/data/g2.dat b/data/g2.dat deleted file mode 100644 index 697d7bbdf80047027fafa70dcc65cd62a409d7b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20666 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 diff --git a/src/config.c b/src/config.c index c7b868c27d..1ac4757029 100644 --- a/src/config.c +++ b/src/config.c @@ -475,9 +475,11 @@ config_section_definition *config_get_section_def(const utf8 *name, int size) { int i; - for (i = 0; i < countof(_sectionDefinitions); i++) - if (_strnicmp(_sectionDefinitions[i].section_name, name, size) == 0) + for (i = 0; i < countof(_sectionDefinitions); i++) { + const_utf8string sectionName = _sectionDefinitions[i].section_name; + if (sectionName[size] == 0 && _strnicmp(sectionName, name, size) == 0) return &_sectionDefinitions[i]; + } return NULL; } @@ -486,9 +488,11 @@ config_property_definition *config_get_property_def(config_section_definition *s { int i; - for (i = 0; i < section->property_definitions_count; i++) - if (_strnicmp(section->property_definitions[i].property_name, name, size) == 0) + for (i = 0; i < section->property_definitions_count; i++) { + const_utf8string propertyName = section->property_definitions[i].property_name; + if (propertyName[size] == 0 && _strnicmp(propertyName, name, size) == 0) return §ion->property_definitions[i]; + } return NULL; }