From 02239fa6cf60755831d5c58f434c80237beb9d14 Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Tue, 25 Feb 2014 16:21:05 +0100 Subject: [PATCH] json-parser: Fix cloning when no marker is set When cloning a json-parser, only clone the marker if it is set in the original, otherwise we may end up crashing trying to strlen(NULL). Reported-by: Fabien Wernli Signed-off-by: Gergely Nagy --- modules/json/jsonparser.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/json/jsonparser.c b/modules/json/jsonparser.c index 9970db82fa..d36dfca11f 100644 --- a/modules/json/jsonparser.c +++ b/modules/json/jsonparser.c @@ -225,7 +225,8 @@ log_json_parser_clone (LogPipe *s) cloned = (LogJSONParser *) log_json_parser_new (); log_json_parser_set_prefix ((LogParser *)cloned, self->prefix); - log_json_parser_set_marker ((LogParser *)cloned, self->marker); + if (self->marker) + log_json_parser_set_marker ((LogParser *)cloned, self->marker); return &cloned->super.super; }