Fix: lttng-live: ctf_live_packet_seek stream hang up handling

[babeltrace.git] / formats / lttng-live / lttng-live-comm.c

diff --git a/formats/lttng-live/lttng-live-comm.c b/formats/lttng-live/lttng-live-comm.c
index ec03fb2fc410eeb849f52977dff86276cb9a6b68..484c025d2d5f0be04a803fa08ac5389e34dc3db0 100644 (file)
--- a/formats/lttng-live/lttng-live-comm.c
+++ b/formats/lttng-live/lttng-live-comm.c
@@ -1108,8 +1108,8 @@ retry:
                viewer_stream->in_trace = 0;
                bt_list_del(&viewer_stream->trace_stream_node);
                bt_list_del(&viewer_stream->session_stream_node);
-               g_free(viewer_stream);
                *stream_id = be64toh(rp->stream_id);
+               g_free(viewer_stream);
                break;
        case LTTNG_VIEWER_INDEX_ERR:
                fprintf(stderr, "[error] get_next_index: error\n");
@@ -1276,7 +1276,11 @@ retry:
                                cur_index->packet_size, cur_index->offset,
                                cur_index->content_size,
                                cur_index->ts_cycles.timestamp_end);
-
+               if (cur_index->offset == EOF) {
+                       pos->offset = EOF;
+                       ret = -BT_PACKET_SEEK_ERROR;
+                       goto end;
+               }
        }
 
        /*
@@ -1667,7 +1671,6 @@ retry:
                 */
                if (g_hash_table_size(ctx->session->ctf_traces) != nr_traces) {
                        printf_verbose("New trace(s) added during add_one_trace()\n");
-                       printf_verbose("JORAJ: GREP HERE\n");
                        goto retry;
                }
        }