From patchwork Fri Nov 24 19:27:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 6340 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp2596178jah; Fri, 24 Nov 2017 11:28:20 -0800 (PST) X-Google-Smtp-Source: AGs4zMZtlFSbMyHTJelN7WGASXCpg5p9DpEtBp3cJfP5R0KIOMK0dtHJnIQxgHE73NhI4PrunKVi X-Received: by 10.223.196.194 with SMTP id o2mr10525489wrf.246.1511551700857; Fri, 24 Nov 2017 11:28:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511551700; cv=none; d=google.com; s=arc-20160816; b=Ukr1BRPGWSCrqb90+4FTsHr6eem2rCQUnJ/gmd+Wf9Y8bU+qBMb12h6cbPh66oJ0Nq n+2y3lyZD/HXjUz05QXhZMUKAYQCHBiNq5YssYpYbAZv49LzW3Zl5NWwdJPmgfJYxlEZ LKgqf5FBJU3LMrkORGjvKLiRzKplE+K/HEzj0pkkXrKcCaofIa2cRP8NIF8cq0DosAC3 wOQyMto2/A1KgDyMX/SV+gKIf5rp7w9C5iH9FpnjOJrpO+ayaRlEp+dVWr9mQqHZXjXB Wa40ngC5xYbvaNXhqtXSNCghTDcV9+y0yr9Eza5svB7ziSe/Dy77F8krin687bJ0MFRK lbBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=/XkB85pN403IIkuPnjBFNF6zYWebnalXfpZALLldp90=; b=klOiHL+mV9rd/YioSyUkrF82pNJF4zizatCBzmFrdYJYlOi8zpe79xpcKX6JJQ1Wt+ /vuMj8U/ATpyaS+pCeyDkxJNduAmJORCAwJLIKaWFwWNtkFO51ZKjc+HA6IGGntZsUFr EolgbjqGQjwKEdg6eai5p7j2XtwwhrJ7EmrRvmny4dOcAL9RqJlFlpZ7nIigZsEZ00MG MSpj7yKJiKE/gH/GCwnCCWOGHZ18kiBufvzML/5xsGuPF4Ai2gkgsq0vBq0zf/g7cMUd Hhvw0wuCEQ+DXUTL69Bom3MCbFbxiiEYkYLlrCE8yjXANC5BA6O1PssykW1LGVBcPWM+ Ldfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NC1PpVN0; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k81si4879982wma.141.2017.11.24.11.28.20; Fri, 24 Nov 2017 11:28:20 -0800 (PST) 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 header.s=20161025 header.b=NC1PpVN0; 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 1743568A1F7; Fri, 24 Nov 2017 21:28:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B19A0680C51 for ; Fri, 24 Nov 2017 21:28:03 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id v186so24414303wma.2 for ; Fri, 24 Nov 2017 11:28:04 -0800 (PST) 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=g4qrPEU0Yf4EJ4yq5Y7n7iRr16aJ72JnVIyWwCNQG8U=; b=NC1PpVN0O91h1lKfHbhZl44PUIsT4o8bBFEdEVHqC6PuE1Y6wQEBnhQmpgABYmt0WG g1bUgo4wYTpesksDQVVNsllCm6mivawlwlRVOSnRBHsZqjHz4npopM4PPijLFO9S1hwm uSVOY71ImUHJ7u4ZuENjBGsYYmycL3xabv5FoF4KdeviJ1Vj2v9NjTP5KtosgnEGf8CA klSoPOmPmRbLrWEEk1i0Pfk9xWB2Bs3dPO8DvKSxQKlse76yv7Tm44wkCy/AZSjM0ag8 nLedxCQafFytuWx9j8UXY7jcjNvlB0vE839gOZOEfBn0Ts9HmDTr/gxSyQDHH9cSh2Vt yKQw== 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=g4qrPEU0Yf4EJ4yq5Y7n7iRr16aJ72JnVIyWwCNQG8U=; b=QeaHM2o1YH+IquEVvhX7A3zFqUxKTgxEkegXsMoMYa95S+XJwR2e0XYkRV685cK4Ni dJemADJe/ROyz3Vb1w7tYnY2rOKHWBLZyBNZYoaoAAKnR2YJ5TCKJv82naArGaMyigFh ygZ12U7dPxvlo6VZEwtbjZga4myHz3k8K2NxP/SozAf5VssbsHEEwV9GlmmRZ4lm5yd3 6m42z88adzQx5XABc/1r/Jve/i4w6vaN8mS7x263Q5PEfQM7JQv5mhG5e/Hw8VJZXu9v 1rFMO6EZkZc6da7b/0WomMawlP0TuAC2kS7yyckl4TuYpJWSzNiq6evIBV3mDTf6J5pZ 7Bvg== X-Gm-Message-State: AJaThX7WSrkEPNGWMUPxUCTGLAUzrkYLKd69m7+oJw/lICa9QSTDan9N nqExGPr65Ie/uAZ8JG/dEhN0WF/+ X-Received: by 10.28.108.11 with SMTP id h11mr10148063wmc.28.1511551684306; Fri, 24 Nov 2017 11:28:04 -0800 (PST) Received: from localhost.localdomain ([149.12.3.113]) by smtp.gmail.com with ESMTPSA id m201sm4299496wma.12.2017.11.24.11.28.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Nov 2017 11:28:03 -0800 (PST) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Nov 2017 19:27:12 +0000 Message-Id: <20171124192713.13230-2-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171124192713.13230-1-derek.buitenhuis@gmail.com> References: <20171124192713.13230-1-derek.buitenhuis@gmail.com> Subject: [FFmpeg-devel] [PATCH 1/2] h264_picture: Actually return error during alloc 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" Fixes NULL dereference during alloc failure. Signed-off-by: Derek Buitenhuis --- libavcodec/h264_picture.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index e7dd84bc47..e833835a77 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -78,24 +78,30 @@ int ff_h264_ref_picture(H264Context *h, H264Picture *dst, H264Picture *src) dst->qscale_table_buf = av_buffer_ref(src->qscale_table_buf); dst->mb_type_buf = av_buffer_ref(src->mb_type_buf); - if (!dst->qscale_table_buf || !dst->mb_type_buf) + if (!dst->qscale_table_buf || !dst->mb_type_buf) { + ret = AVERROR(ENOMEM); goto fail; + } dst->qscale_table = src->qscale_table; dst->mb_type = src->mb_type; for (i = 0; i < 2; i++) { dst->motion_val_buf[i] = av_buffer_ref(src->motion_val_buf[i]); dst->ref_index_buf[i] = av_buffer_ref(src->ref_index_buf[i]); - if (!dst->motion_val_buf[i] || !dst->ref_index_buf[i]) + if (!dst->motion_val_buf[i] || !dst->ref_index_buf[i]) { + ret = AVERROR(ENOMEM); goto fail; + } dst->motion_val[i] = src->motion_val[i]; dst->ref_index[i] = src->ref_index[i]; } if (src->hwaccel_picture_private) { dst->hwaccel_priv_buf = av_buffer_ref(src->hwaccel_priv_buf); - if (!dst->hwaccel_priv_buf) + if (!dst->hwaccel_priv_buf) { + ret = AVERROR(ENOMEM); goto fail; + } dst->hwaccel_picture_private = dst->hwaccel_priv_buf->data; }