From patchwork Sun Mar 12 13:51:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 2902 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp813550vsy; Sun, 12 Mar 2017 06:52:41 -0700 (PDT) X-Received: by 10.223.169.161 with SMTP id b30mr24503840wrd.196.1489326761891; Sun, 12 Mar 2017 06:52:41 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s26si7154325wma.12.2017.03.12.06.52.41; Sun, 12 Mar 2017 06:52:41 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 86C83680BE9; Sun, 12 Mar 2017 15:52:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 677E0680558 for ; Sun, 12 Mar 2017 15:52:16 +0200 (EET) Received: by mail-qt0-f196.google.com with SMTP id n37so3503301qtb.3 for ; Sun, 12 Mar 2017 06:52:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=+RtvfksmbSTQ7WfWMKQcvpEcDZT7xtscd379jATkTHk=; b=aJq9xs6LcPkenYoTO+xCalMe54ti6N4m6cXVNCcIZqXnXnzAjZXtR7xXwDOvN+2xoV ggk5ippN89Ml1rhaUTgGdcYz/WTWIrMxMzhg1CbzoxJNAbx7U0lVoV9R+QUK6mgL2Wpl YweRWrOEYIRnXEAVzNNQSuwMxTLujbsGoIQIwRhPFjd4hWt/FOiGNUwjmhorhDp/CXvL MOi5hlnC/rM/i2WFwXtkLwGSXP03+7iExc4PMNyyExpeZk+RVTnyvnB3t9WJ2XBJ4gZv o7R3bhE26vuq/5CcdfsIJGZECT2K/4AhpPYQJteG4Q/OU9kd5RwoKgaICwoD1XhtQb/H ybZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=+RtvfksmbSTQ7WfWMKQcvpEcDZT7xtscd379jATkTHk=; b=Hj3VhLmCXdkBwRv6WN6YEkBNsVXGP4JHlPW1O6tjpE5ogETXqyYnioqpbilcxMknkF tj8jWPr3vxcqUjSWHJePIoPXVUlCol+/bdsY8yohlZLMZ5lcXdrxuFWYBLmsCEAeR37P UnVA/GBOHkwnOPM99ZoaHQ+xwPQWA3do6u7Xunc7dbRY6z+2Voc7tS0JSGX5l+PrUaqi oxJXNEcGEtZckn15Jb0im6tPXgicVtU6puKdUmJTJ3Ofdh8kA5i67TIHRx3M5n5DyT41 a3nkfPl0qIrTDgflNrmpWD0UVpNrgf+vOuopfKoksS+rzuHY5tOg7i3yOdtnPp3YGcgJ /IZg== X-Gm-Message-State: AMke39nQYv09dbb2EKec7WF6wN2ULBfpPoZnPTZ3OKJwUZS1mfs8vychCNFqVKFYZD5wXg== X-Received: by 10.200.34.212 with SMTP id g20mr28992246qta.97.1489326750266; Sun, 12 Mar 2017 06:52:30 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id t12sm10261917qke.9.2017.03.12.06.52.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 12 Mar 2017 06:52:29 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Mar 2017 10:51:27 -0300 Message-Id: <20170312135127.2436-1-jamrial@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170312131237.GG5776@nb4> References: <20170312131237.GG5776@nb4> Subject: [FFmpeg-devel] [PATCH] test/api-seek: clean up properly on failure X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Also propagate better error values. Signed-off-by: James Almer --- To be applied before the realloc memleak fix. tests/api/api-seek-test.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/tests/api/api-seek-test.c b/tests/api/api-seek-test.c index 6ef3b91933..b33a5dd158 100644 --- a/tests/api/api-seek-test.c +++ b/tests/api/api-seek-test.c @@ -197,19 +197,22 @@ static int seek_test(const char *input_filename, const char *start, const char * result = avformat_find_stream_info(fmt_ctx, NULL); if (result < 0) { av_log(NULL, AV_LOG_ERROR, "Can't get stream info\n"); - return result; + goto end; } start_ts = read_seek_range(start); end_ts = read_seek_range(end); - if ((start_ts < 0) || (end_ts < 0)) - return -1; + if ((start_ts < 0) || (end_ts < 0)) { + result = -1; + goto end; + } //TODO: add ability to work with audio format video_stream = av_find_best_stream(fmt_ctx, AVMEDIA_TYPE_VIDEO, -1, -1, NULL, 0); if (video_stream < 0) { av_log(NULL, AV_LOG_ERROR, "Can't find video stream in input file\n"); - return -1; + result = video_stream; + goto end; } origin_par = fmt_ctx->streams[video_stream]->codecpar; @@ -217,52 +220,56 @@ static int seek_test(const char *input_filename, const char *start, const char * codec = avcodec_find_decoder(origin_par->codec_id); if (!codec) { av_log(NULL, AV_LOG_ERROR, "Can't find decoder\n"); - return -1; + result = AVERROR_DECODER_NOT_FOUND; + goto end; } ctx = avcodec_alloc_context3(codec); if (!ctx) { av_log(NULL, AV_LOG_ERROR, "Can't allocate decoder context\n"); - return AVERROR(ENOMEM); + result = AVERROR(ENOMEM); + goto end; } result = avcodec_parameters_to_context(ctx, origin_par); if (result) { av_log(NULL, AV_LOG_ERROR, "Can't copy decoder context\n"); - return result; + goto end; } result = avcodec_open2(ctx, codec, NULL); if (result < 0) { av_log(ctx, AV_LOG_ERROR, "Can't open decoder\n"); - return result; + goto end; } fr = av_frame_alloc(); if (!fr) { av_log(NULL, AV_LOG_ERROR, "Can't allocate frame\n"); - return AVERROR(ENOMEM); + result = AVERROR(ENOMEM); + goto end; } result = compute_crc_of_packets(fmt_ctx, video_stream, ctx, fr, 0, 0, 1); if (result != 0) - return -1; + goto end; for (i = start_ts; i < end_ts; i += 100) { for (j = i + 100; j < end_ts; j += 100) { result = compute_crc_of_packets(fmt_ctx, video_stream, ctx, fr, i, j, 0); if (result != 0) - return -1; + break; } } +end: av_freep(&crc_array); av_freep(&pts_array); av_frame_free(&fr); avcodec_close(ctx); avformat_close_input(&fmt_ctx); avcodec_free_context(&ctx); - return 0; + return result; } int main(int argc, char **argv)