From patchwork Wed Sep 13 20:06:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 5135 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp1251986jaa; Wed, 13 Sep 2017 13:07:20 -0700 (PDT) X-Received: by 10.28.223.195 with SMTP id w186mr3725509wmg.105.1505333240868; Wed, 13 Sep 2017 13:07:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505333240; cv=none; d=google.com; s=arc-20160816; b=XNLGvyf2pXrqTRZmEcfxIhzbjSsxXAR45fGdNY2p1zSRdDNfwg40H4g4pjTmvWCrN5 /IGJ5fQ8FMrZtq/Blu/jPxmLFduz0MpTY+c1hEE3z0kViscmAhhRWpokhXwrnGmt2mwv VD9VfIcnWr9R8Txn8Y95wCTXPT0+6MBNc+3yN5vITlaPouqyXqtasEV0kKsc6244G0C5 uzMPrfHTYXDZy7C9bcA3c3lMSrIDPwcubvme7enTR5spbycEa5Ft+4QLnF2Tex2amKoR JyRQYCe8hxr1ozU6+O7iChwIicfcov4tNa0X8kDkFUrN2c2OoRlNFola4u/23XfzkjnY Pcfw== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=9TG8BKv1YpwuP6Ju+n85VCqG8VwSy7HGMhlrdFW2YJQ=; b=st70ahKqD8/7KXvr7aCJ+6y18xEHJjz1TsFbjizCaUNk15UT+CNFDPRNwnsYdQk6e/ yEPoGkiUU3ivzvOwk3AIqsICg1RZDOaRttoG24xkUBHCzpTCoBSv55cwcyEY1Xa1GqCq xHp17uDhqYNjF76IFzXEcu5OSUml3e1pGrhFXC6Orly/PhOZZMyDDjLbISTocVSsbPBk WP2u7n521tioUTz/2VlIY3zU2gCBfuRcns8YmlZthWNh8td8DN7zFff4mshuvS0wM9ci K+b7rKOQxMlJCq2KfhdMBWIKL7D+TDpRWWqMiW21kJDeA15gw9wEriRA1dFVlOwoU9xH O99g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Lvm0XsJp; 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 n4si237596wrf.267.2017.09.13.13.07.19; Wed, 13 Sep 2017 13:07:20 -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 header.s=20161025 header.b=Lvm0XsJp; 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 558F7689DCA; Wed, 13 Sep 2017 23:07:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f171.google.com (mail-qk0-f171.google.com [209.85.220.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E29A1689DCA for ; Wed, 13 Sep 2017 23:07:04 +0300 (EEST) Received: by mail-qk0-f171.google.com with SMTP id j5so3212704qkd.0 for ; Wed, 13 Sep 2017 13:07:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=tV/7A6oiFieMYs2vHzHxzzstFCMiKuv4xF+XWhu8Axc=; b=Lvm0XsJpldfCFp2fq2VtcoOqToXVGVWG90XbnAHn4DxcsgthcN09s+dOopRBP8u9E0 lElSWwykcuxUy8HwhfH7jdkbPQrGxv0C5appx9YitrsNrj5zGSElgG2Rf5Z9sQt4VUSf A/DUjdMWpWHBs2z0/LLR8k8TdUvlUL4tpe4UnoIGAHBsaaNUf/a3pPuNlN5CGfNHla8/ LTQPMQc8kGU+A8/Pd9Rjo8QkmXYmjC3Qdh88dis3zOa8uJ95eDZ5M5Ud5Q3oiMQbBaqy o8ZZXlOoTTBD2SBbucNQSbruD2MvMPc+Pfh1O6ktn2l/P3fLG6IZWtuPgb0YIz55aVZE maAQ== 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; bh=tV/7A6oiFieMYs2vHzHxzzstFCMiKuv4xF+XWhu8Axc=; b=QdoobDkVdCJ8zVdMLsj5zGx09+S6hGqe94WbPf5N31f9xTz9V883R829EjhueF6s1p fdKBOZ4hQFBwDOtTkBPzpLcuCwq5xUHnUcReS5rV8M2ILjMhNcCTf1narxvQTRVCw+vk 9wYpaZ/MhYgOerVAThkwmNtryRgfsrWqmWsAnQeJ69HwMSnvTmgL7W4m2TLeOL9EXjaC LZ8pZN1R9XgxJs3yx/zu7Q3cysGcqo5cJC4PYuAZzbXhIWRLW+c/6g83jsr9BgHPNfbM 1PwIjDMTVBhRoL5IhGHF+suYYyQ8oKsArjPlz5UWCTj+DSTKg8hEF6w9bAQr7tJE866X xcgA== X-Gm-Message-State: AHPjjUiugbyzh4Iz8wDAUhV0GIMgHXmIwYQ5cYubPvr3BjHVJIQXd1wQ ngQ5RK+Etn3erKgR X-Google-Smtp-Source: AOwi7QBVahYimTFjnJt0HSZXyMbjE++7eMlsanLc6uOw187t8UfhY/mPLu2P0B2HIrNkVOt5F8sYbA== X-Received: by 10.55.116.134 with SMTP id p128mr25321158qkc.50.1505333229946; Wed, 13 Sep 2017 13:07:09 -0700 (PDT) Received: from localhost.localdomain ([181.231.68.242]) by smtp.gmail.com with ESMTPSA id x1sm123038qti.33.2017.09.13.13.07.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Sep 2017 13:07:09 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Sep 2017 17:06:51 -0300 Message-Id: <20170913200651.4944-1-jamrial@gmail.com> X-Mailer: git-send-email 2.13.3 Subject: [FFmpeg-devel] [PATCH] avcodec/extract_extradata: return an error when buffer allocation fails 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" ret is 0 by default. --- libavcodec/extract_extradata_bsf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c index 4cd0ca1137..ed6509c681 100644 --- a/libavcodec/extract_extradata_bsf.c +++ b/libavcodec/extract_extradata_bsf.c @@ -101,14 +101,17 @@ static int extract_extradata_h2645(AVBSFContext *ctx, AVPacket *pkt, if (s->remove) { filtered_buf = av_buffer_alloc(pkt->size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!filtered_buf) + if (!filtered_buf) { + ret = AVERROR(ENOMEM); goto fail; + } filtered_data = filtered_buf->data; } extradata = av_malloc(extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); if (!extradata) { av_buffer_unref(&filtered_buf); + ret = AVERROR(ENOMEM); goto fail; }