Fix: bt_common_string_until(): reset returned variable on error

[babeltrace.git] / src / common / common.c

diff --git a/src/common/common.c b/src/common/common.c
index dacb5054fa04280e04a0f44b0bc7af2a1bb7eb20..b2b76cde1c0ec17107c45bef72151a4d9d91c51a 100644 (file)
--- a/src/common/common.c
+++ b/src/common/common.c
@@ -512,6 +512,7 @@ set_end_pos:
 error:
        if (output) {
                g_string_free(output, TRUE);
+               output = NULL;
        }
 
 end:
@@ -1780,9 +1781,7 @@ end:
                g_strfreev(lines);
        }
 
-       if (line_words) {
-               g_strfreev(line_words);
-       }
+       BT_ASSERT(!line_words);
 
        if (tmp_line) {
                g_string_free(tmp_line, TRUE);