Fix: safety checks for opening mmap traces
authorJulien Desfossez <jdesfossez@efficios.com>
Fri, 10 Aug 2012 21:36:48 +0000 (17:36 -0400)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Fri, 10 Aug 2012 21:36:48 +0000 (17:36 -0400)
When adding a mmap trace in the context, we don't have any tracefile and
index, some safety checks were missing in the path handling and
timestamp manipulation.

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
formats/ctf/ctf.c
lib/context.c

index f33fa3394ec52be5d11c4dd102ffb468025156ca..69917f7fb5d9cfc8dcaf246128f77d93557d7c6d 100644 (file)
@@ -167,6 +167,9 @@ uint64_t ctf_timestamp_begin(struct trace_descriptor *descriptor,
                        if (!stream_pos->packet_real_index)
                                goto error;
 
+                       if (stream_pos->packet_real_index->len <= 0)
+                               continue;
+
                        if (type == BT_CLOCK_REAL) {
                                index = &g_array_index(stream_pos->packet_real_index,
                                                struct packet_index,
@@ -225,6 +228,9 @@ uint64_t ctf_timestamp_end(struct trace_descriptor *descriptor,
                        if (!stream_pos->packet_real_index)
                                goto error;
 
+                       if (stream_pos->packet_real_index->len <= 0)
+                               continue;
+
                        if (type == BT_CLOCK_REAL) {
                                index = &g_array_index(stream_pos->packet_real_index,
                                                struct packet_index,
@@ -1845,6 +1851,9 @@ int ctf_convert_index_timestamp(struct trace_descriptor *tdp)
                        stream_pos->packet_real_index = g_array_new(FALSE, TRUE,
                                        sizeof(struct packet_index));
 
+                       if (!stream_pos->packet_cycles_index)
+                               continue;
+
                        for (k = 0; k < stream_pos->packet_cycles_index->len; k++) {
                                struct packet_index *index;
                                struct packet_index new_index;
index 373944c20c2144fd0e0d0ab20a56578f635cc641..e2c1739c41ff548a21ae13a3e62f983779590e5b 100644 (file)
@@ -104,8 +104,10 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path,
        }
        handle->format = fmt;
        handle->td = td;
-       strncpy(handle->path, path, PATH_MAX);
-       handle->path[PATH_MAX - 1] = '\0';
+       if (path) {
+               strncpy(handle->path, path, PATH_MAX);
+               handle->path[PATH_MAX - 1] = '\0';
+       }
 
        if (fmt->set_handle)
                fmt->set_handle(td, handle);
This page took 0.03492 seconds and 4 git commands to generate.