From patchwork Sat Mar 21 06:31:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18315 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 19766449B21 for ; Sat, 21 Mar 2020 08:31:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E7EFB68B7CB; Sat, 21 Mar 2020 08:31:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EDFD268B7A1 for ; Sat, 21 Mar 2020 08:31:26 +0200 (EET) Received: by mail-wr1-f50.google.com with SMTP id j17so6587719wru.13 for ; Fri, 20 Mar 2020 23:31:26 -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:mime-version :content-transfer-encoding; bh=gGUFQs4O4lg/JETVi+fq9yzlKBkizI+WMjYc91o6Ps0=; b=TiQOCgbrt3LHzkOm7YYZ/B8xNbWdBKR5cneyM8VUNY5lSyCia/cU9ffkLV/vDQXTrC BBEiak+H4q+ma3q1hXSnly3YUiCO2ZfjoQ57CxyxrTaU3ic27CJlbiL8nLfQmRuqbwR8 LI3z+ohCg1BrTjAqmh4uAmhqOQwtN/yxDhnLPucGqOuEozmvM1PWthik0mGjHeh33jQ+ VUGisQ70GMBpwnZ+yjP8XdBgE3EP+vbbghrwZMqj5TnlvpyVonOms2Ghd+yo76dsBNw7 8IceGjY9l8SMJWZNgl/+gJI/+rCVgMfWTmltOK+aLQ+IRWb28IW+XP4nYIspu4RCw9BN ciEA== 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:mime-version :content-transfer-encoding; bh=gGUFQs4O4lg/JETVi+fq9yzlKBkizI+WMjYc91o6Ps0=; b=TVqMqH2z93WmoIGH3T8jXQ2QpT/soSHOs/C7wy7KA1f+7K9mMd825mYpXwNmPoof4W OPdOBVRAKUgnrjlX5QwneZJCyAmk3hJ1wLVBO2gjPsvlLYAvXhws3iAefnIVxkz9jThX 0J8Efv8Sfzvmg6Nqszx4IYqLyQPzMrmCnvqv8vHyo94UjWf3TwAYtYH7aVeGc9BOAtef KdjEjwPAOIwisYaQbAV0QyDvM5g0rsjniJ6s8QRqCE+fcR3NNazKO2CHJCiChBcpau/X GPTmHMTr3w2z3cCGwtWzEtbIrhdr6jsTRvWPNOyWrJSq6QVU25SuZeGDDD5ijuPiM9QI ncew== X-Gm-Message-State: ANhLgQ3fTRq3JcqX90KXHaOrtKEbg0i6wiDzGOMuXqzKisfmUDFrHO1I QjAI+LSPmdqLrzaRSrej/QT4yF87 X-Google-Smtp-Source: ADFU+vtQZSqlHsINMdeBLlw3WGuQSpyCeFf3epIQWQMpf3G75dHVGyw7Yn/JlwpIMxw4YajRktAMoA== X-Received: by 2002:a5d:6aca:: with SMTP id u10mr14719376wrw.99.1584772286022; Fri, 20 Mar 2020 23:31:26 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id k3sm11281487wro.59.2020.03.20.23.31.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 23:31:25 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 Mar 2020 07:31:17 +0100 Message-Id: <20200321063118.6790-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/hnm: Check for extradata allocation 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" and also add padding to it; moreover, don't use memcpy to write one byte to extradata. Signed-off-by: Andreas Rheinhardt --- libavformat/hnm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/hnm.c b/libavformat/hnm.c index 40ef5c06ee..31221553a4 100644 --- a/libavformat/hnm.c +++ b/libavformat/hnm.c @@ -70,6 +70,7 @@ static int hnm_read_header(AVFormatContext *s) Hnm4DemuxContext *hnm = s->priv_data; AVIOContext *pb = s->pb; AVStream *vst; + int ret; /* default context members */ hnm->pts = 0; @@ -113,10 +114,10 @@ static int hnm_read_header(AVFormatContext *s) vst->codecpar->codec_tag = 0; vst->codecpar->width = hnm->width; vst->codecpar->height = hnm->height; - vst->codecpar->extradata = av_mallocz(1); + if ((ret = ff_alloc_extradata(vst->codecpar, 1)) < 0) + return ret; - vst->codecpar->extradata_size = 1; - memcpy(vst->codecpar->extradata, &hnm->version, 1); + vst->codecpar->extradata[0] = hnm->version; vst->start_time = 0;