comparison matroskadec.c @ 3414:703f452f00f1 libavformat

reorganize matroska_add_stream() to fix potential mem leak and buffer overflow fix CID44

3413:b7f86452706e

{
    int res = 0;
    uint32_t id;
    MatroskaTrack *track;

    av_log(matroska->ctx, AV_LOG_DEBUG, "parsing track, adding stream..,\n");

    /* Allocate a generic track. As soon as we know its type we'll realloc. */
    track = av_mallocz(MAX_TRACK_SIZE);
    matroska->num_tracks++;
    strcpy(track->language, "eng");

    /* start with the master */
    if ((res = ebml_read_master(matroska, &id)) < 0)
        return res;

    /* try reading the trackentry headers */
    while (res == 0) {
        if (!(id = ebml_peek_id(matroska, &matroska->level_up))) {
            res = AVERROR(EIO);

                               "Unknown or unsupported track type 0x%x\n",
                               track->type);
                        track->type = MATROSKA_TRACK_TYPE_NONE;
                        break;
                }
                matroska->tracks[matroska->num_tracks - 1] = track;
                break;
            }

            /* tracktype specific stuff for video */
            case MATROSKA_ID_TRACKVIDEO: {

            matroska->level_up--;
            break;
        }
    }

    return res;
}

static int
matroska_parse_tracks (MatroskaDemuxContext *matroska)

3414:703f452f00f1

{
    int res = 0;
    uint32_t id;
    MatroskaTrack *track;

    /* start with the master */
    if ((res = ebml_read_master(matroska, &id)) < 0)
        return res;

    av_log(matroska->ctx, AV_LOG_DEBUG, "parsing track, adding stream..,\n");

    /* Allocate a generic track. As soon as we know its type we'll realloc. */
    track = av_mallocz(MAX_TRACK_SIZE);
    strcpy(track->language, "eng");

    /* try reading the trackentry headers */
    while (res == 0) {
        if (!(id = ebml_peek_id(matroska, &matroska->level_up))) {
            res = AVERROR(EIO);

                               "Unknown or unsupported track type 0x%x\n",
                               track->type);
                        track->type = MATROSKA_TRACK_TYPE_NONE;
                        break;
                }
                break;
            }

            /* tracktype specific stuff for video */
            case MATROSKA_ID_TRACKVIDEO: {

            matroska->level_up--;
            break;
        }
    }

    if (track->type && matroska->num_tracks < ARRAY_SIZE(matroska->tracks)) {
        matroska->tracks[matroska->num_tracks++] = track;
    } else {
        av_free(track);
    }
    return res;
}

static int
matroska_parse_tracks (MatroskaDemuxContext *matroska)