mp4: Hide ->read_error.

[paraslash.git] / mp4.c

diff --git a/mp4.c b/mp4.c
index e7dbcc7953164fd4f5b81d8ed993caef6f89f912..991ba08db18ab9d4aa38f06afef8603cc2be4fef 100644 (file)
--- a/mp4.c
+++ b/mp4.c
@@ -15,12 +15,8 @@
 struct mp4_track {
        bool is_audio;
        int32_t channelCount;
-       int32_t sampleSize;
        uint16_t sampleRate;
 
-       /* stsd */
-       int32_t stsd_entry_count;
-
        /* stsz */
        int32_t stsz_sample_size;
        int32_t stsz_sample_count;
@@ -41,9 +37,6 @@ struct mp4_track {
        int32_t stco_entry_count;
        int32_t *stco_chunk_offset;
 
-       uint32_t maxBitrate;
-       uint32_t avgBitrate;
-
        uint32_t timeScale;
        uint64_t duration;
 };
@@ -59,6 +52,8 @@ struct mp4 {
        uint64_t moov_size;
        uint8_t last_atom;
        uint64_t file_size;
+
+       uint32_t read_error;
        uint32_t error;
 
        /* incremental track index while reading the file */
@@ -83,7 +78,7 @@ static int32_t read_data(struct mp4 *f, void *data, uint32_t size)
        result = f->stream->read(f->stream->user_data, data, size);
 
        if (result < size)
-               f->stream->read_error++;
+               f->read_error++;
 
        f->current_position += size;
 
@@ -451,7 +446,7 @@ static int32_t read_stsz(struct mp4 *f)
        if (t->stsz_sample_size != 0)
                return 0;
        t->stsz_table = para_malloc(t->stsz_sample_count * sizeof(int32_t));
-       for (i = 0; i < t->stsz_sample_count && !f->stream->read_error; i++)
+       for (i = 0; i < t->stsz_sample_count && !f->read_error; i++)
                t->stsz_table[i] = read_int32(f);
        return 0;
 }
@@ -476,7 +471,7 @@ static int32_t read_stts(struct mp4 *f)
        t->stts_sample_delta = para_malloc(t->stts_entry_count
                * sizeof (int32_t));
        /* CVE-2017-9254 */
-       for (i = 0; i < t->stts_entry_count && !f->stream->read_error; i++) {
+       for (i = 0; i < t->stts_entry_count && !f->read_error; i++) {
                t->stts_sample_count[i] = read_int32(f);
                t->stts_sample_delta[i] = read_int32(f);
        }
@@ -502,7 +497,7 @@ static int32_t read_stsc(struct mp4 *f)
                sizeof (int32_t));
 
        /* CVE-2017-9255 */
-       for (i = 0; i < t->stsc_entry_count && !f->stream->read_error; i++) {
+       for (i = 0; i < t->stsc_entry_count && !f->read_error; i++) {
                t->stsc_first_chunk[i] = read_int32(f);
                t->stsc_samples_per_chunk[i] = read_int32(f);
                t->stsc_sample_desc_index[i] = read_int32(f);
@@ -525,7 +520,7 @@ static int32_t read_stco(struct mp4 *f)
        t->stco_chunk_offset = para_malloc(t->stco_entry_count
                * sizeof(int32_t));
        /* CVE-2017-9256 */
-       for (i = 0; i < t->stco_entry_count && !f->stream->read_error; i++)
+       for (i = 0; i < t->stco_entry_count && !f->read_error; i++)
                t->stco_chunk_offset[i] = read_int32(f);
        return 0;
 }
@@ -558,7 +553,7 @@ static int32_t read_mp4a(struct mp4 *f)
        read_int32(f);  /* reserved */
 
        t->channelCount = read_int16(f);
-       t->sampleSize = read_int16(f);
+       read_int16(f);
 
        read_int16(f);
        read_int16(f);
@@ -573,7 +568,7 @@ static int32_t read_mp4a(struct mp4 *f)
 
 static int32_t read_stsd(struct mp4 *f)
 {
-       int32_t i;
+       int32_t i, entry_count;
        uint8_t header_size = 0;
        struct mp4_track *t;
 
@@ -585,10 +580,10 @@ static int32_t read_stsd(struct mp4 *f)
        read_char(f);   /* version */
        read_int24(f);  /* flags */
 
-       t->stsd_entry_count = read_int32(f);
+       entry_count = read_int32(f);
 
        /* CVE-2017-9253 */
-       for (i = 0; i < t->stsd_entry_count && !f->stream->read_error; i++) {
+       for (i = 0; i < entry_count && !f->read_error; i++) {
                uint64_t skip = get_position(f);
                uint64_t size;
                uint8_t atom_type = 0;
@@ -824,7 +819,7 @@ static int32_t parse_tag(struct mp4 *f, uint8_t parent, int32_t size)
 
        for (
                sumsize = 0;
-               sumsize < size && !f->stream->read_error; /* CVE-2017-9222 */
+               sumsize < size && !f->read_error; /* CVE-2017-9222 */
                set_position(f, destpos), sumsize += subsize
        ) {
                subsize = atom_read_header(f, &atom_type, &header_size);
@@ -1046,7 +1041,7 @@ static int32_t parse_atoms(struct mp4 *f, int meta_only)
        uint8_t header_size = 0;
 
        f->file_size = 0;
-       f->stream->read_error = 0;
+       f->read_error = 0;
 
        while ((size =
                atom_read_header(f, &atom_type, &header_size)) != 0) {
@@ -1908,11 +1903,6 @@ static int32_t write_int32(struct mp4 *f, uint32_t data)
        return write_data(f, temp, sizeof(temp));
 }
 
-static int32_t truncate_stream(struct mp4 *f)
-{
-       return f->stream->truncate(f->stream->user_data);
-}
-
 int32_t mp4_meta_update(struct mp4_callback *f, const struct mp4_metadata *data)
 {
        void *new_moov_data;
@@ -1947,9 +1937,7 @@ int32_t mp4_meta_update(struct mp4_callback *f, const struct mp4_metadata *data)
                write_data(ff, "moov", 4);
                write_data(ff, new_moov_data, new_moov_size);
        }
-
-       truncate_stream(ff);
-
+       f->truncate(f->user_data);
        mp4_close(ff);
        return 1;
 }