pdxx
/
libfastcommon
mirror of https://github.com/happyfish100/libfastcommon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

eliminate potential trouble

dev
liuwei 2015-08-18 09:46:25 +08:00
parent a173000298
commit 9208cfde96
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ini_file_reader.c
View File

@ -285,7 +285,7 @@ static int iniDoLoadItemsFromBuffer(char *content, IniContext *pContext)
char *pAnnoItemLine; char *pAnnoItemLine;
char *pIncludeFilename; char *pIncludeFilename;
char *pItemValue[100]; char *pItemValue[100];
char full_funcName[128]; char full_funcName[FAST_INI_ITEM_VALUE_LEN];
char full_filename[MAX_PATH_SIZE]; char full_filename[MAX_PATH_SIZE];
int i; int i;
int nLineLen; int nLineLen;
@ -296,7 +296,6 @@ static int iniDoLoadItemsFromBuffer(char *content, IniContext *pContext)
int isAnnotation; int isAnnotation;
result = 0; result = 0;
nItemCnt = -1;
pAnnoItemLine = NULL; pAnnoItemLine = NULL;
isAnnotation = 0; isAnnotation = 0;
pLastEnd = content - 1; pLastEnd = content - 1;
@ -379,7 +378,8 @@ static int iniDoLoadItemsFromBuffer(char *content, IniContext *pContext)
(*(pLine+10) == ' ' || *(pLine+10) == '\t'))) (*(pLine+10) == ' ' || *(pLine+10) == '\t')))
{ {
nNameLen = strlen(pLine + 11) + 1; nNameLen = strlen(pLine + 11) + 1;
nNameLen = nNameLen > 128 ? 128 : nNameLen; nNameLen = nNameLen > FAST_INI_ITEM_VALUE_LEN ?
FAST_INI_ITEM_VALUE_LEN : nNameLen;
memcpy(pFunc_name, pLine + 11, nNameLen); memcpy(pFunc_name, pLine + 11, nNameLen);
trim(pFunc_name); trim(pFunc_name);
isAnnotation = 1; isAnnotation = 1;
@ -510,11 +510,11 @@ static int iniDoLoadItemsFromBuffer(char *content, IniContext *pContext)
continue; continue;
} }
nItemCnt = -1;
pAnnoMap = g_annotataionMap; pAnnoMap = g_annotataionMap;
while (pAnnoMap->func_name) while (pAnnoMap->func_name)
{ {
if (strlen(pAnnoMap->func_name) == strlen(pFunc_name) if (strcmp(pFunc_name, pAnnoMap->func_name) == 0)
&& strcasecmp(pFunc_name, pAnnoMap->func_name) == 0)
{ {
if (pAnnoMap->func_init) if (pAnnoMap->func_init)
{ {