From 86fb20324690a80f763b7de6d78749c17ad3f482 Mon Sep 17 00:00:00 2001 From: Ludmila Glinskih Date: Sat, 27 Jun 2015 17:31:08 +0300 Subject: [PATCH] api-flac-test: Fix the bug of comparing zero bytes Add check for linesize. Signed-off-by: Michael Niedermayer --- tests/api/api-flac-test.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/tests/api/api-flac-test.c b/tests/api/api-flac-test.c index a6180bcf40..07030d6dda 100644 --- a/tests/api/api-flac-test.c +++ b/tests/api/api-flac-test.c @@ -112,10 +112,10 @@ static int run_test(AVCodec *enc, AVCodec *dec, AVCodecContext *enc_ctx, AVFrame *in_frame, *out_frame; uint8_t *raw_in = NULL, *raw_out = NULL; int in_offset = 0, out_offset = 0; - int frame_data_size = 0; int result = 0; int got_output = 0; int i = 0; + int in_frame_bytes, out_frame_bytes; in_frame = av_frame_alloc(); if (!in_frame) { @@ -156,8 +156,13 @@ static int run_test(AVCodec *enc, AVCodec *dec, AVCodecContext *enc_ctx, generate_raw_frame((uint16_t*)(in_frame->data[0]), i, enc_ctx->sample_rate, enc_ctx->channels, enc_ctx->frame_size); - memcpy(raw_in + in_offset, in_frame->data[0], in_frame->linesize[0]); - in_offset += in_frame->linesize[0]; + in_frame_bytes = in_frame->nb_samples * av_frame_get_channels(in_frame) * sizeof(uint16_t); + if (in_frame_bytes > in_frame->linesize[0]) { + av_log(NULL, AV_LOG_ERROR, "Incorrect value of input frame linesize\n"); + return 1; + } + memcpy(raw_in + in_offset, in_frame->data[0], in_frame_bytes); + in_offset += in_frame_bytes; result = avcodec_encode_audio2(enc_ctx, &enc_pkt, in_frame, &got_output); if (result < 0) { av_log(NULL, AV_LOG_ERROR, "Error encoding audio frame\n"); @@ -192,14 +197,19 @@ static int run_test(AVCodec *enc, AVCodec *dec, AVCodecContext *enc_ctx, av_log(NULL, AV_LOG_ERROR, "Error frames before and after decoding has different sample format\n"); return AVERROR_UNKNOWN; } - memcpy(raw_out + out_offset, out_frame->data[0], out_frame->linesize[0]); - out_offset += out_frame->linesize[0]; + out_frame_bytes = out_frame->nb_samples * av_frame_get_channels(out_frame) * sizeof(uint16_t); + if (out_frame_bytes > out_frame->linesize[0]) { + av_log(NULL, AV_LOG_ERROR, "Incorrect value of output frame linesize\n"); + return 1; + } + memcpy(raw_out + out_offset, out_frame->data[0], out_frame_bytes); + out_offset += out_frame_bytes; } } av_free_packet(&enc_pkt); } - if (memcmp(raw_in, raw_out, frame_data_size * NUMBER_OF_FRAMES) != 0) { + if (memcmp(raw_in, raw_out, out_frame_bytes * NUMBER_OF_FRAMES) != 0) { av_log(NULL, AV_LOG_ERROR, "Output differs\n"); return 1; }