From patchwork Wed Jul 17 22:38:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 13977 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2586144779C for ; Thu, 18 Jul 2019 01:39:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 04C2B68AC02; Thu, 18 Jul 2019 01:39:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 02B01689BB7 for ; Thu, 18 Jul 2019 01:39:07 +0300 (EEST) Received: by mail-qk1-f196.google.com with SMTP id s22so18864321qkj.12 for ; Wed, 17 Jul 2019 15:39:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=abKKWou2+Wp/J1/qxSj5LrezctBrFprITQAiNdAfddc=; b=ISZnhZTCxCfscyLQBDczb0TIFChauGj7L7+lj6Iwpvzysm/1ZPg9IP2g3n7fwgozHh nudkTQlkqxRswAT9NcyFjegDfOC3QlWWUGlW5RehocaZP3SXjPlP647IP8M+WJlfuYtg Ln9RQ0q0RAC9AJYjv67Iz1Kv4KHXWyxJck5S/bU67EqDUw0iWlWOH/1g2oZoi+BZ6H1o GB7mq2eK2yYSwejmMbsKGxWaXafic2pHdJVnBzlFyC/cM/9MaNwV+6mUFW3p5/cd8F3e d681yNt+Y49Na43gGTuzzECnbYXFn8mCcHKMIPpanCMLrAOqi2/SoN9/reprP5RSvZjD QVuw== 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:mime-version :content-transfer-encoding; bh=abKKWou2+Wp/J1/qxSj5LrezctBrFprITQAiNdAfddc=; b=MIRQIoyaAJo1f4QpVjtx/IyyG0aH9S9bYbcdj2VhlE0zYYgPTwVR6aiMNTpUrBTtQS Dyaeh3+unmwgnXHyoRl7qNtvm0EZGfo38eCtFfgdPfj62YZ08DbjGuXDZKd/HYOdlt8y KoQfOHdHIXdAYTL9k98clY//IlpI1dNaLIQkYClmlcJYsB8Wv7AIPuY5pkzhMwsIMMFn NEacSfoBtTWANHFMoLhfrgcV75jSFnkycg/ZG9XzexAopBp+7s6Bfv1c5sDvcnMrSRIw QdBM+WCdPhxZxmXAb1iTy0mh6o2ulKa+H/wrW0KAZ/Nr/hCKM931BOmgW7ydDVl4xo1g GHmQ== X-Gm-Message-State: APjAAAWCQIB7Ehr5Ynz/NdPQ2D2HRVZu1TIL+OCCE399FVOjczMFADbS XTwf+qO+azWR9rYi82Yq0zujRFLs X-Google-Smtp-Source: APXvYqzKi4mLWL3DGo7R1VU2TH71RoUh7excBsLYYF+EBBa9QTOS/KZF6mhGPVB9+vdb/U/j4ynfiw== X-Received: by 2002:a37:a389:: with SMTP id m131mr28950204qke.168.1563403145256; Wed, 17 Jul 2019 15:39:05 -0700 (PDT) Received: from localhost.localdomain ([181.23.90.19]) by smtp.gmail.com with ESMTPSA id m12sm10551928qkk.123.2019.07.17.15.39.03 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 15:39:04 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Jul 2019 19:38:50 -0300 Message-Id: <20190717223850.6773-1-jamrial@gmail.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/tak_parser: don't return error values 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The API does not allow it. Also set poutbuf and poutbuf_size to NULL/0 on error to avoid leaving them uninitialized. Signed-off-by: James Almer --- libavcodec/tak_parser.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libavcodec/tak_parser.c b/libavcodec/tak_parser.c index 835a47bd52..7943d2ed3a 100644 --- a/libavcodec/tak_parser.c +++ b/libavcodec/tak_parser.c @@ -49,7 +49,7 @@ static int tak_parse(AVCodecParserContext *s, AVCodecContext *avctx, if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) { TAKStreamInfo ti; if ((ret = init_get_bits8(&gb, buf, buf_size)) < 0) - return ret; + goto fail; if (!ff_tak_decode_frame_header(avctx, &gb, &ti, 127)) s->duration = t->ti.last_frame_samples ? t->ti.last_frame_samples : t->ti.frame_samples; @@ -65,7 +65,7 @@ static int tak_parse(AVCodecParserContext *s, AVCodecContext *avctx, const uint8_t *tmp_buf = buf; if (ff_combine_frame(pc, END_NOT_FOUND, &tmp_buf, &tmp_buf_size) != -1) - return AVERROR(ENOMEM); + goto fail; consumed += tmp_buf_size; buf += tmp_buf_size; buf_size -= tmp_buf_size; @@ -78,7 +78,7 @@ static int tak_parse(AVCodecParserContext *s, AVCodecContext *avctx, if ((ret = init_get_bits8(&gb, pc->buffer + t->index, pc->index - t->index)) < 0) - return ret; + goto fail; if (!ff_tak_decode_frame_header(avctx, &gb, pc->frame_start_found ? &ti : &t->ti, 127) && !ff_tak_check_crc(pc->buffer + t->index, @@ -103,9 +103,7 @@ found: if (consumed && !buf_size && next == END_NOT_FOUND || ff_combine_frame(pc, next, &buf, &buf_size) < 0) { - *poutbuf = NULL; - *poutbuf_size = 0; - return buf_size + consumed; + goto fail; } if (next != END_NOT_FOUND) { @@ -116,6 +114,12 @@ found: *poutbuf = buf; *poutbuf_size = buf_size; return next; + +fail: + + *poutbuf = NULL; + *poutbuf_size = 0; + return buf_size + consumed; } AVCodecParser ff_tak_parser = {