Add out-of-bound checks

[babeltrace.git] / formats / ctf-text / types / struct.c

diff --git a/formats/ctf-text/types/struct.c b/formats/ctf-text/types/struct.c
index 20bc1a7f3f8e872bc1ec72c737e3c6ff57c7c050..760f1727d4f37d4968b8f2456d2e9dacec2cc168 100644 (file)
--- a/formats/ctf-text/types/struct.c
+++ b/formats/ctf-text/types/struct.c
@@ -19,20 +19,25 @@
 #include <babeltrace/ctf-text/types.h>
 #include <stdio.h>
 
-void ctf_text_struct_write(struct stream_pos *ppos, struct definition *definition)
+int ctf_text_struct_write(struct stream_pos *ppos, struct definition *definition)
 {
-       struct declaration *declaration = definition->declaration;
        struct ctf_text_stream_pos *pos = ctf_text_pos(ppos);
+       int ret;
 
        if (!pos->dummy) {
-               print_pos_tabs(pos);
-               fprintf(pos->fp, "{\n");
+               if (pos->depth >= 0) {
+                       print_pos_tabs(pos);
+                       fprintf(pos->fp, "{\n");
+               }
                pos->depth++;
        }
-       struct_rw(ppos, definition);
+       ret = struct_rw(ppos, definition);
        if (!pos->dummy) {
                pos->depth--;
-               print_pos_tabs(pos);
-               fprintf(pos->fp, "}\n");
+               if (pos->depth >= 0) {
+                       print_pos_tabs(pos);
+                       fprintf(pos->fp, "}\n");
+               }
        }
+       return ret;
 }