Fixed core dumps when closing unintialized mongo or sqlite log instances

Fixed a Host header bug in sinqhttpopt
This commit is contained in:
2016-04-08 11:24:02 +02:00
parent 1087dd6c8d
commit 1fb85ef6b5
4 changed files with 16 additions and 11 deletions

View File

@ -29,9 +29,11 @@ static void MongoCallback(unsigned int severity, const char *timeStamp,
static void MongoClose(void *data)
{
RemoveLogCallback(MongoCallback);
mongoc_collection_destroy (collection);
mongoc_client_destroy (client);
mongoc_cleanup ();
if(collection != NULL){
mongoc_collection_destroy (collection);
mongoc_client_destroy (client);
mongoc_cleanup ();
}
client = NULL;
collection = NULL;
}
@ -155,7 +157,7 @@ static void QueryCallback(const bson_t *doc, void *userData)
bson_iter_find(&iter,"severity");
severity = bson_iter_int32(&iter);
formatSeverity(severity,sevBuf,sizeof(sevBuf));
DynStringConcat(result,(char *)severity);
DynStringConcat(result,(char *)sevBuf);
DynStringConcatChar(result,' ');
bson_iter_find(&iter,"sub");
sub = bson_iter_utf8(&iter,&length);
@ -182,7 +184,7 @@ static int MongoQueryAction(SConnection * pCon, SicsInterp * pSics,
error = sicslogGetError();
SCPrintf(pCon,eError,"Error %s querying mongodb", error);
} else {
SCPureSockWrite(pCon,GetCharArray(result),eValue);
SCPureSockWrite(pCon,GetCharArray(result),eLog);
}
DeleteDynString(result);
return 1;