From: Francis Deslauriers <francis.deslauriers@efficios.com>
Date: Mon, 16 Sep 2019 14:54:45 +0000 (-0400)
Subject: Fix: ctf-writer: stream-class.c: Dereference after null check
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=94c1a13b2867da334582f9284e4ac1e9bb11eb5d

Fix: ctf-writer: stream-class.c: Dereference after null check

Coverity reported the following:
  CID 1401231 (#1 of 1): Dereference after null check (FORWARD_NULL)8.
  var_deref_model: Passing null pointer ft_copy to
  bt_ctf_field_type_common_integer_set_mapped_clock_class_no_check_frozen,
  which dereferences it

Reported-by: Coverity - 1401231 Dereference after null check (FORWARD_NULL)
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: I32a15f0ff927c8b987e785a37596e9c56b628de5
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2049
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
---

diff --git a/src/ctf-writer/stream-class.c b/src/ctf-writer/stream-class.c
index ac3db47a..2d3b2fba 100644
--- a/src/ctf-writer/stream-class.c
+++ b/src/ctf-writer/stream-class.c
@@ -776,6 +776,8 @@ int try_map_clock_class(struct bt_ctf_stream_class *stream_class,
 		if (!ft_copy) {
 			BT_LOGE("Failed to copy integer field type: ft-addr=%p",
 				ft);
+			ret = -1;
+			goto end;
 		}
 
 		ret = bt_ctf_field_type_common_integer_set_mapped_clock_class_no_check_frozen(