From patchwork Fri Nov 4 18:11:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1297 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1449602vsb; Fri, 4 Nov 2016 11:12:06 -0700 (PDT) X-Received: by 10.28.13.9 with SMTP id 9mr4454166wmn.50.1478283126436; Fri, 04 Nov 2016 11:12:06 -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 d82si6602929wmd.67.2016.11.04.11.12.05; Fri, 04 Nov 2016 11:12:06 -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=@googlemail.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=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D7A09689DFC; Fri, 4 Nov 2016 20:12:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E0DD689DDC for ; Fri, 4 Nov 2016 20:11:55 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id u144so5077406wmu.0 for ; Fri, 04 Nov 2016 11:11:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:subject:to:references:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=c+72kvV+JxEWd49IqSoL8lCmQUXKHOF1RuLxB/rL2OE=; b=eHbZRj3LFS0rWi2l3xoNFgSjvolocQonOTjQOIvRiOuzqpmbNCMCFIfBuVBj32rAIJ OyhtR44Cjbqa2xYjAtcu2gif9JEG8TvWg9DyzOdCsdvAX948bzqeOieShQwG0xTMLJRx oE0qodxS1newZMh5iI6zxNEL0YLE6trnI6G6nbhYD+GIjYOUmrzIIBBGeTd3c9253rga 4WbSqbOT+2QlLVUUH4GC4gN0hPKMcPhgVG/cXAuYe45Rl6mtJJIrOaphClWW8Hz8Gq79 CqLhVubFzq7iLdlRRFA+jrYML1x9hvAPT1uU67Mbaa2nNfNxjALeo6a34R2V7oc4SWsI +w1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=c+72kvV+JxEWd49IqSoL8lCmQUXKHOF1RuLxB/rL2OE=; b=XnFL/x7M4bxcMP+xxguNN8gLUx1peActCYs3tLxPjzwJEKVe+DHEhvJfHW2yVIVclq CIjNKsnWPXzwl8JzfH+yQw7WiV1vi5P/Mg6GwO38f9c+kpAyTmPSvIHW7oxTQlKhSa9/ 4La5QrbRmOJ2kiz8as599StnhoswlE5oJRvXqRmYvL30hIR19268S5PW6nGUKsISGQYo uOdmQsptcwu/zvuwIvLdXIEP29NsoGAj4bfzL2ILbUfUajqW2UzvmSfScBmo2isyNijF fihPt3+mDONvIsuE28eZ9f/5Kgm4oeZ+suB/PvJXXD0l8rJhPhcHzQ5LOahf2jGBhByq MCLQ== X-Gm-Message-State: ABUngvc2XA7W3bziCi0Y8Ka9mWr+VBXhU8YAph09I5PLDS5v4zqb3M4y2gJgcKE8E/XPZQ== X-Received: by 10.28.234.68 with SMTP id i65mr4913458wmh.4.1478283118091; Fri, 04 Nov 2016 11:11:58 -0700 (PDT) Received: from [192.168.2.21] (p5B09506C.dip0.t-ipconnect.de. [91.9.80.108]) by smtp.googlemail.com with ESMTPSA id w203sm5800133wmw.16.2016.11.04.11.11.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Nov 2016 11:11:57 -0700 (PDT) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches References: Message-ID: <789b500b-c44f-fba8-812c-265175d4cf94@googlemail.com> Date: Fri, 4 Nov 2016 19:11:56 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 In-Reply-To: Subject: [FFmpeg-devel] [PATCH 3/3] diracdec: check return code of get_buffer_with_edge 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" If it fails, buffers aren't allocated, causing NULL pointer dereferencing. Signed-off-by: Andreas Cadhalpun --- libavcodec/diracdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index bb314d0..e0604af 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -1975,7 +1975,9 @@ static int dirac_decode_picture_header(DiracContext *s) for (j = 0; j < MAX_FRAMES; j++) if (!s->all_frames[j].avframe->data[0]) { s->ref_pics[i] = &s->all_frames[j]; - get_buffer_with_edge(s->avctx, s->ref_pics[i]->avframe, AV_GET_BUFFER_FLAG_REF); + ret = get_buffer_with_edge(s->avctx, s->ref_pics[i]->avframe, AV_GET_BUFFER_FLAG_REF); + if (ret < 0) + return ret; break; }