Fix: dmesg.c: deference before `NULL` check

[babeltrace.git] / src / plugins / text / dmesg / dmesg.c

diff --git a/src/plugins/text/dmesg/dmesg.c b/src/plugins/text/dmesg/dmesg.c
index 7243bbb5d777dfdb28c416118f0b9a37ae6df297..7fa50720e4588e9ff333d5d7d170d1de0b878720 100644 (file)
--- a/src/plugins/text/dmesg/dmesg.c
+++ b/src/plugins/text/dmesg/dmesg.c
@@ -24,7 +24,7 @@
 #define BT_COMP_LOG_SELF_COMP (dmesg_comp->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (dmesg_comp->log_level)
 #define BT_LOG_TAG "PLUGIN/SRC.TEXT.DMESG"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include <stdbool.h>
 #include <string.h>
@@ -296,9 +296,7 @@ error:
        ret = -1;
 
 end:
-       if (basename) {
-               g_free(basename);
-       }
+       g_free(basename);
 
        return ret;
 }
@@ -636,12 +634,14 @@ end:
 static
 void destroy_dmesg_msg_iter(struct dmesg_msg_iter *dmesg_msg_iter)
 {
-       struct dmesg_component *dmesg_comp = dmesg_msg_iter->dmesg_comp;
+       struct dmesg_component *dmesg_comp;
 
        if (!dmesg_msg_iter) {
                return;
        }
 
+       dmesg_comp = dmesg_msg_iter->dmesg_comp;
+
        if (dmesg_msg_iter->fp && dmesg_msg_iter->fp != stdin) {
                if (fclose(dmesg_msg_iter->fp)) {
                        BT_COMP_LOGE_ERRNO("Cannot close input file", ".");