diff options
| -rw-r--r-- | plugins/omelasticsearch/omelasticsearch.c | 6 | ||||
| -rw-r--r-- | runtime/glbl.c | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/plugins/omelasticsearch/omelasticsearch.c b/plugins/omelasticsearch/omelasticsearch.c index cb96fb6b..5c53ba19 100644 --- a/plugins/omelasticsearch/omelasticsearch.c +++ b/plugins/omelasticsearch/omelasticsearch.c @@ -224,6 +224,12 @@ checkConn(instanceData *pData) DBGPRINTF("omelasticsearch: checkConn() curl_easy_init() failed\n"); ABORT_FINALIZE(RS_RET_SUSPENDED); } + /* Bodypart of request not needed, so set curl opt to nobody and httpget, otherwise lib-curl could sigsegv */ + curl_easy_setopt(curl, CURLOPT_HTTPGET, TRUE); + curl_easy_setopt(curl, CURLOPT_NOBODY, TRUE); + /* Only enable for debugging + curl_easy_setopt(curl, CURLOPT_VERBOSE, TRUE); */ + cstr = es_str2cstr(url, NULL); curl_easy_setopt(curl, CURLOPT_URL, cstr); free(cstr); diff --git a/runtime/glbl.c b/runtime/glbl.c index 6af38e01..cbb9b20f 100644 --- a/runtime/glbl.c +++ b/runtime/glbl.c @@ -621,7 +621,10 @@ glblProcessMainQCnf(struct cnfobj *o) void glblDestructMainqCnfObj() { - nvlstChkUnused(mainqCnfObj->nvlst); + /* Only destruct if not NULL! */ + if (mainqCnfObj != NULL) { + nvlstChkUnused(mainqCnfObj->nvlst); + } cnfobjDestruct(mainqCnfObj); mainqCnfObj = NULL; } |