From 63a3d043e3f14eebb0798a250d9aecdc8e89dfb9 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 13 Jan 2015 15:13:40 -0800 Subject: Consistently use the "g_string_free returns a C string pointer" idiom. g_string_free(str, FALSE) frees the GString container but not the underlying g_malloc()ed string; instead, it returns a pointer to the g_malloc()ed string. Fix those places that didn't already get the string pointer from g_string_free() to do so rather than manually extracting the string themselves. And fix one place that didn't even need to use a string - it was just scanning a C string without even modifying it. Change-Id: Ibbf4872bf5b9935b9907f539b6edb1013f3053a5 Reviewed-on: https://code.wireshark.org/review/6532 Reviewed-by: Guy Harris --- capchild/capture_sync.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'capchild') diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c index e1c6870745..55be896395 100644 --- a/capchild/capture_sync.c +++ b/capchild/capture_sync.c @@ -1147,8 +1147,7 @@ sync_pipe_run_command_actual(char** argv, gchar **data, gchar **primary_msg, */ *primary_msg = NULL; *secondary_msg = NULL; - *data = data_buf->str; - g_string_free(data_buf, FALSE); + *data = g_string_free(data_buf, FALSE); } break; -- cgit v1.2.3