Propagate error from packet_seek in case of truncated packet

[babeltrace.git] / converter / babeltrace.c

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index 2e4003ca45807c9acf6c9d6ce0811c487c1941b6..6e6c3385f6e986fed202a297dc623ac463f28d87 100644 (file)
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -663,6 +663,7 @@ int convert_trace(struct bt_trace_descriptor *td_write,
        struct bt_iter_pos *begin_pos = NULL, *end_pos = NULL;
        struct bt_ctf_event *ctf_event;
        int ret;
+       int error_holder = 0;
 
        sout = container_of(td_write, struct ctf_text_stream_pos,
                        trace_descriptor);
@@ -689,11 +690,18 @@ int convert_trace(struct bt_trace_descriptor *td_write,
                        goto end;
                }
                ret = bt_iter_next(bt_ctf_get_iter(iter));
-               if (ret < 0) {
+               if (ret == -ERANGE) {
+                       /*
+                        * Remember that a range (truncated packet)
+                        * error occurred and continue.
+                        */
+                       error_holder = 1;
+                       continue;
+               } else if (ret < 0) {
                        goto end;
                }
        }
-       ret = 0;
+       ret = error_holder;
 
 end:
        bt_ctf_iter_destroy(iter);