rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-18 20:20:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

omelasticsearch: fixing leak while writing error file

Browse Source 
since we switched to libfastjson, the default error function is
duplicating the string from fjson_object_to_json_string in order to free
the fjson object.
we however don't free the duplicated string later

fix that by adding a free
also add a second duplication for the second case of rendered string;
this makes the code easier to read instead of adding another condition.

Fixes: issue #1668
Signed-off-by: William Dauchy <w.dauchy@criteo.com>
This commit is contained in:
William Dauchy 2017-07-27 18:32:03 +02:00
parent 66db9db816
commit b620c70d64
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/omelasticsearch/omelasticsearch.c
View File

@ -1039,7 +1039,7 @@ writeDataError(wrkrInstanceData_t *pWrkrData, instanceData *pData, fjson_object
DBGPRINTF("omelasticsearch: error creating file content.\n");
ABORT_FINALIZE(RS_RET_ERR);
}
rendered = (char*)fjson_object_to_json_string(ctx.errRoot);
rendered = strdup((char*)fjson_object_to_json_string(ctx.errRoot));
}
@ -1069,6 +1069,7 @@ writeDataError(wrkrInstanceData_t *pWrkrData, instanceData *pData, fjson_object
finalize_it:
if(bMutLocked)
pthread_mutex_unlock(&pData->mutErrFile);
free(rendered);
fjson_object_put(ctx.errRoot);
RETiRet;
}