Fix: leak on error in lttng-crash

[lttng-tools.git] / src / bin / lttng-crash / lttng-crash.c

diff --git a/src/bin/lttng-crash/lttng-crash.c b/src/bin/lttng-crash/lttng-crash.c
index f34e618949efdbfe116a5785068e9a602f41bae5..4f1efe96dada1b00671309b1fe39358ce4bed411 100644 (file)
--- a/src/bin/lttng-crash/lttng-crash.c
+++ b/src/bin/lttng-crash/lttng-crash.c
@@ -209,7 +209,7 @@ static void usage(FILE *ofp)
 {
        fprintf(ofp, "LTTng Crash Trace Viewer " VERSION " - " VERSION_NAME "%s\n\n",
                GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION);
-       fprintf(ofp, "usage: lttng [OPTIONS] FILE\n");
+       fprintf(ofp, "usage: lttng-crash [OPTIONS] FILE\n");
        fprintf(ofp, "\n");
        fprintf(ofp, "Options:\n");
        fprintf(ofp, "  -V, --version              Show version.\n");
@@ -766,7 +766,8 @@ int copy_crash_data(const struct lttng_crash_layout *layout, int fd_dest,
        readlen = lttng_read(fd_src, buf, src_file_len);
        if (readlen < 0) {
                PERROR("Error reading input file");
-               return -1;
+               ret = -1;
+               goto end;
        }
 
        prod_offset = crash_get_field(layout, buf, prod_offset);
@@ -1001,6 +1002,9 @@ int extract_trace_recursive(const char *output_path,
 
                        ret = extract_trace_recursive(output_subpath,
                                input_subpath);
+                       if (ret) {
+                               has_warning = 1;
+                       }
                        break;
                }
                case DT_REG: