linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SICS-778 Fix crash in conman.c hookFunc

Browse Source
This commit is contained in:
Douglas Clowes
2014-09-12 13:00:26 +10:00
parent cc9d59ee73
commit 042119898d
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
conman.c
View File

@ -2127,8 +2127,17 @@ static void hookFunc(const char *pText, OutCode eOut, void*pData)
{ {
SConnection *pCon = (SConnection *) pData; SConnection *pCon = (SConnection *) pData;
int text_len = strlen(pText); int text_len = strlen(pText);
char txt[5];
ANETwrite(pCon->sockHandle, pText, text_len); if (!VerifyConnection(pCon)) {
return;
}
if (!ANETvalidHandle(pCon->sockHandle)) {
return;
}
snprintf(txt, 5, "%3s:", OutCodeToTxt(eOut));
ANETwrite(pCon->sockHandle, txt, 4);
ANETwrite(pCon->sockHandle, (char *)pText, text_len);
if (pText[text_len - 1] != '\n') if (pText[text_len - 1] != '\n')
ANETwrite(pCon->sockHandle, "\n", 1); ANETwrite(pCon->sockHandle, "\n", 1);
} }
@ -2151,9 +2160,13 @@ int KillCapture(SConnection * pCon)
int LogCapture(SConnection * pCon, SicsInterp * pSics, void *pData, int LogCapture(SConnection * pCon, SicsInterp * pSics, void *pData,
int argc, char *argv[]) int argc, char *argv[])
{ {
SConnection * pConMaster;
char pBueffel[512]; char pBueffel[512];
int i; int i;
pConMaster = SCfindMaster(pCon);
if (pConMaster == NULL)
return 0;
/* check no af args */ /* check no af args */
if (argc < 2) { if (argc < 2) {
snprintf(pBueffel,sizeof(pBueffel)-1, "Insufficient number of arguments to %s", argv[0]); snprintf(pBueffel,sizeof(pBueffel)-1, "Insufficient number of arguments to %s", argv[0]);
@ -2164,18 +2177,19 @@ int LogCapture(SConnection * pCon, SicsInterp * pSics, void *pData,
/* Branch according to argv[1] */ /* Branch according to argv[1] */
if (strcmp(argv[1], "kill") == 0) { if (strcmp(argv[1], "kill") == 0) {
KillCapture(pCon); KillCapture(pConMaster);
return 1; return 1;
} else if (strcmp(argv[1], "all") == 0) { } else if (strcmp(argv[1], "all") == 0) {
AddSICSLogHook(hookFunc, "all", pCon); AddSICSLogHook(hookFunc, "all", pConMaster);
return 1; return 1;
} else if (argc == 2) { } else if (argc == 2) {
/* must be outcode, try find it */ /* must be outcode, try find it */
AddSICSLogHook(hookFunc, argv[1], pCon); AddSICSLogHook(hookFunc, argv[1], pConMaster);
return 1; return 1;
} else { } else {
/* make it a list */ /* make it a list */
int i, len; int i;
size_t len;
char *pBuff; char *pBuff;
for (i = 1, len = 0; i < argc; ++i) for (i = 1, len = 0; i < argc; ++i)
len += strlen(argv[i]) + 1; len += strlen(argv[i]) + 1;
@ -2193,7 +2207,7 @@ int LogCapture(SConnection * pCon, SicsInterp * pSics, void *pData,
strcpy(&pBuff[len], argv[i]); strcpy(&pBuff[len], argv[i]);
len += strlen(argv[i]); len += strlen(argv[i]);
} }
AddSICSLogHook(hookFunc, pBuff, pCon); AddSICSLogHook(hookFunc, pBuff, pConMaster);
if (pBuff != pBueffel) if (pBuff != pBueffel)
free(pBuff); free(pBuff);
return 1; return 1;
@ -2212,7 +2226,8 @@ int LogOutput(SConnection * pCon, SicsInterp * pSics, void *pData,
{ {
char pBueffel[512]; char pBueffel[512];
char *pBuff; char *pBuff;
int i, len, result, start; int i, result, start;
size_t len;
OutCode outcode; OutCode outcode;
/* check no af args */ /* check no af args */
@ -2323,7 +2338,7 @@ int SCTaskFunction(void *pData)
pPassword = strtok(NULL, " \t\r\n"); pPassword = strtok(NULL, " \t\r\n");
iRet = IsValidUser(pUser, pPassword); iRet = IsValidUser(pUser, pPassword);
if (iRet >= 0) { if (iRet >= 0) {
SCWrite(self, "Login OK", eError); SCWrite(self, "Login OK", eLog);
self->iLogin = 1; self->iLogin = 1;
SCSetRights(self, iRet); SCSetRights(self, iRet);
pHost[0] = '\0'; pHost[0] = '\0';