diff options
| author | Martin Storsjö | 2012-07-03 14:18:58 +0300 |
|---|---|---|
| committer | Martin Storsjö | 2012-07-03 22:46:53 +0300 |
| commit | 1be8c90847300ac7889833612c99d57c58ff64b1 (patch) | |
| tree | b8dbcda0bd841d87e36bf9cc102c7f90f3566e37 /tools/ismindex.c | |
| parent | 1a068bfefd5da09f596e5079b39b418933bad0ea (diff) | |
ismindex: Properly report errors reading the MFRA atom
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'tools/ismindex.c')
| -rw-r--r-- | tools/ismindex.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/tools/ismindex.c b/tools/ismindex.c index 5980869c24..1614cca8e9 100644 --- a/tools/ismindex.c +++ b/tools/ismindex.c @@ -209,10 +209,14 @@ static int read_mfra(struct VideoFiles *files, int start_index, avio_seek(f, avio_size(f) - 4, SEEK_SET); mfra_size = avio_rb32(f); avio_seek(f, -mfra_size, SEEK_CUR); - if (avio_rb32(f) != mfra_size) + if (avio_rb32(f) != mfra_size) { + err = AVERROR_INVALIDDATA; goto fail; - if (avio_rb32(f) != MKBETAG('m', 'f', 'r', 'a')) + } + if (avio_rb32(f) != MKBETAG('m', 'f', 'r', 'a')) { + err = AVERROR_INVALIDDATA; goto fail; + } while (!read_tfra(files, start_index, f)) { /* Empty */ } @@ -223,6 +227,8 @@ static int read_mfra(struct VideoFiles *files, int start_index, fail: if (f) avio_close(f); + if (err) + fprintf(stderr, "Unable to read the MFRA atom in %s\n", file); return err; } @@ -355,7 +361,7 @@ static int handle_file(struct VideoFiles *files, const char *file, int split) avformat_close_input(&ctx); - read_mfra(files, orig_files, file, split); + err = read_mfra(files, orig_files, file, split); fail: if (ctx) @@ -509,7 +515,8 @@ int main(int argc, char **argv) } else if (argv[i][0] == '-') { return usage(argv[0], 1); } else { - handle_file(&vf, argv[i], split); + if (handle_file(&vf, argv[i], split)) + return 1; } } if (!vf.nb_files || (!basename && !split)) |