tinyds: enable protocol_trace only when protocol_trace_init() returns true

This fixes segfault when rule file doen't exist and
protocol_trace_init() returns false.

Change-Id: I3785fb664c87c13d717556f7219760bc32dc1afb

diff --git a/examples/protocol-trace.c b/examples/protocol-trace.c
index d57e3c2..7975b0d 100644 (file)
--- a/examples/protocol-trace.c
+++ b/examples/protocol-trace.c
@@ -1516,6 +1516,8 @@ rule_init(char *rule_path)
     ds_dbg("rule_path = %s", rule_path);
 
     ret = rule_set(argc, (const char**)&(argv[0]), reply, len);
+    if (!ret) return ret;
+
     ds_inf("%s", &tmpReply);
 
     return ret;

diff --git a/examples/tinyds-tdm.c b/examples/tinyds-tdm.c
index b64271e..abed3ab 100644 (file)
--- a/examples/tinyds-tdm.c
+++ b/examples/tinyds-tdm.c
@@ -1013,10 +1013,8 @@ init_server(struct tinyds_server *server, struct wl_display *display)
     if (!add_new_input_method(server))
         goto err;
 
-    if (!protocol_trace_init(display))
-        goto err;
-
-    protocol_trace_enable(true);
+    if (protocol_trace_init(display))
+        protocol_trace_enable(true);
 
     return true;