From fb739d291234e3cfbd89e8802d72aa2032ec0b0f Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Wed, 7 Aug 2019 22:21:02 -0400 Subject: [PATCH] Fix: extra '%' causes babeltrace2 to abort() in logging code MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit An extra '%' in a TRACE logging statement causes bt_common_custom_vsnprintf() to interpret '!' as a conversion specifier. This causes handle_conversion_specifier_bt() to invoke abort(). Signed-off-by: Jérémie Galarneau Change-Id: Ia077616ea84559dfc3abb57d6404d06a6e9b7baf Reviewed-on: https://review.lttng.org/c/babeltrace/+/1836 Tested-by: jenkins --- src/lib/graph/query-executor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/graph/query-executor.c b/src/lib/graph/query-executor.c index cf265fd3..efd6b51f 100644 --- a/src/lib/graph/query-executor.c +++ b/src/lib/graph/query-executor.c @@ -77,7 +77,7 @@ struct bt_query_executor *bt_query_executor_create_with_method_data( BT_ASSERT_PRE_NON_NULL(comp_cls, "Component class"); BT_ASSERT_PRE_NON_NULL(object, "Object"); BT_LIB_LOGD("Creating query executor: " - "%![comp-cls-]+C, object=\"%s\", %![params-]%+v", + "%![comp-cls-]+C, object=\"%s\", %![params-]+v", comp_cls, object, params); query_exec = g_new0(struct bt_query_executor, 1); if (!query_exec) { @@ -126,7 +126,7 @@ struct bt_query_executor *bt_query_executor_create_with_method_data( bt_object_init_shared(&query_exec->base, bt_query_executor_destroy); BT_LIB_LOGD("Created query executor: " - "addr=%p, %![comp-cls-]+C, object=\"%s\", %![params-]%+v", + "addr=%p, %![comp-cls-]+C, object=\"%s\", %![params-]+v", query_exec, comp_cls, object, params); end: -- 2.34.1