Skip padding from metadata end of packet

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index fee9a5578d809de68f233c2b855980a6f1fb0173..23a2179bbf19851bb4685143df0c3301a4e2959d 100644 (file)
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -568,10 +568,19 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in,
                toread -= readlen;
                if (!toread) {
                        ret = 0;        /* continue reading next packet */
                toread -= readlen;
                if (!toread) {
                        ret = 0;        /* continue reading next packet */

-                       break;
+                       goto read_padding;

                }
        }
        return ret;
                }
        }
        return ret;

+
+read_padding:
+       toread = (header.packet_size - header.content_size) / CHAR_BIT;
+       ret = fseek(in, toread, SEEK_CUR);
+       if (ret < 0) {
+               fprintf(stdout, "[warning] Missing padding at end of file\n");
+               ret = 0;
+       }
+       return ret;

 }
 
 static
 }
 
 static