From patchwork Sun Sep 22 14:06:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15225 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 6DD46449F6F for ; Sun, 22 Sep 2019 17:06:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F146688334; Sun, 22 Sep 2019 17:06:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE2B76881B1 for ; Sun, 22 Sep 2019 17:06:23 +0300 (EEST) Received: by mail-pf1-f195.google.com with SMTP id a2so7347654pfo.10 for ; Sun, 22 Sep 2019 07:06:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=YT6DBhfw0gaXed7SqmxLJZrxfI6eAHyzN5yMDadLZzY=; b=AOi2kdfuDymxpsRTZ+IqHvR/jpk5RSuepYb/MdqYMCJECIS8dnP/Dk/PfbflaLMxgo 5m38SAZDpeqZT7nlBG0921D4hw2TDqfwgw9APdOhuIEiZXfCpcEHRoxPq7o2K4wmq693 e3qfqwWEahofHRVUu2ZNx3RR/eT7islzbtS5HaK6bX0vtwQKyRHR/dbfBZ6DjPkKUZ04 aBh0avnSzQbx5tR1aMQT7hejmUJJaK15FGI1HlDdvvRdbqBdNxJVgfmOCn2AJLZiZpwE g/XbrLP1UihD+PzKOaD9gPgINx1s2IlBkVLGYRJJIkoMxm2MCcFsK18BzxY+7+avrOAu AghQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=YT6DBhfw0gaXed7SqmxLJZrxfI6eAHyzN5yMDadLZzY=; b=P6ecT73L3RqMD47Ndb6XktxKrntd4xhmZtteKm8ZG6VCPCf1G3VNfivAXpXO8NRZh2 aUz0IuC44JX+dLPET+SruaLYQVzbtu+DAF7Qv9zA1EYmo+SIpjvp/g7YF0whrFJRfYiy 0v7aY295wYhHbBRLGDKF++rd0mBvKJrN8VmYUSjXDqmsnWCtq2DG1/8uRZvFvG5rdYJm e8HkRqi6n8F+qHE11ldz/XW7gRlRprESe9fwvs5B/hPhz2iHWko2ni4YiAuBwmeamPRd NM5Z8kDHQa06chS+WLhTMC5SdbYhXmKJOVoy4B0QnUKg2E9wXOzimB0y30tejtaaIbkF 6WfQ== X-Gm-Message-State: APjAAAUrKL6BU9+jWDkkOrlMsfvMAfymfHme1+hc4fqphyS6B1O+uPT4 O9pVQNIW6ogTS4vT2U2eJxOdAEh8 X-Google-Smtp-Source: APXvYqzkA0xSg5/+XJj/BFgbvdWVSmsS4udqgFhj801ZBI83ikLs99yi3SJUoWpp7XonyFNEbngMaA== X-Received: by 2002:a62:7a12:: with SMTP id v18mr29206908pfc.205.1569161181905; Sun, 22 Sep 2019 07:06:21 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id 7sm7970913pfi.91.2019.09.22.07.06.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Sep 2019 07:06:21 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Sep 2019 22:06:16 +0800 Message-Id: <20190922140616.2216-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 Subject: [FFmpeg-devel] [PATCH v1] avcodec/dnxhdenc: return error if av_malloc failed 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/dnxhdenc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 41b8079..f144406 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -365,7 +365,7 @@ fail: static av_cold int dnxhd_encode_init(AVCodecContext *avctx) { DNXHDEncContext *ctx = avctx->priv_data; - int i, index, ret; + int i = 1, index, ret; switch (avctx->pix_fmt) { case AV_PIX_FMT_YUV422P: @@ -542,12 +542,15 @@ FF_ENABLE_DEPRECATION_WARNINGS if (avctx->active_thread_type == FF_THREAD_SLICE) { for (i = 1; i < avctx->thread_count; i++) { ctx->thread[i] = av_malloc(sizeof(DNXHDEncContext)); + if(!ctx->thread[i]) + goto fail; memcpy(ctx->thread[i], ctx, sizeof(DNXHDEncContext)); } } return 0; fail: // for FF_ALLOCZ_OR_GOTO + avctx->thread_count = i; return AVERROR(ENOMEM); }