From patchwork Wed Jan 1 00:58:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17093 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6214:1865:0:0:0:0 with SMTP id eh5csp217410qvb; Tue, 31 Dec 2019 17:00:04 -0800 (PST) X-Google-Smtp-Source: APXvYqww5DewE9rtWo9JIJp6jJ0c4jEkJwk5SunAih4y7X3y12O+6VE0XRxHnqcb4TUDQSS4lqca X-Received: by 2002:a50:a2c7:: with SMTP id 65mr78683947edm.144.1577840404875; Tue, 31 Dec 2019 17:00:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577840404; cv=none; d=google.com; s=arc-20160816; b=JK3FNZMhSlHhJS1ZX+T3yAln8bXTUs48ylP+xqQX4uP7kUzFyW+b4anRmxuXg+WmBQ 5hhOh57YRfLZGv1/yrJisJGpdJaWhlqM507vObOgHFxj4yOMqU4ytI/rTgHd7ZUptpxa 7je8ciaKLMbnLJfuz2wmBCwgDojZnmCgdHgZr3if0Rtn+CoxmyUpvUd1Bjweq8YVbDTw Od0HcM64oZejpCLGqKFInqYPM3HMN8F73APCb5q0/yPQzVx4yjNl+lLQoEN3yvfPk+pZ Kbq9GRQQ9mgHS4biMI/dDYh9R/SVf8udLhmXH5yNRuB7obqNygAmeoyWO/03rYbtAGmX rSxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=SCTzM5aeviafz7pD7ORo32y6ABUKxZYeXmiH3BfnsSE=; b=xSsvjDPPAnvRqkgkhDtGVbZA6RLnQNdDzEsdC01q7JT2tDyejT62BMhTnZFJoQ/Am7 xjvl0PAHI7OygURTpQGB8v5o/Q8z/FOVxwIs4voBZHoPQtN/iNnI0czCAj9TTTe+S/io KNfTtAFpeS1m7heEUMznietwzRM0Lhv0b2cwhuYqy0W4YV5labEw3471O5culWc6ttLq 7nKUA2Dr3vOChY5w5cn/1aNZXIh9IJNzCbM7NQWezlcZx8rzN83SVg35ve/LPmGQSlsg Z9SO2wroKwIIMhIWu2neO+bY+zZUyQ4Bjhj4qmAlApRJYGu+ppYCdCb7ehiFG8TJlcPY og4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=aDEGVgvk; 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=QUARANTINE 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 cy13si33738927edb.436.2019.12.31.17.00.04; Tue, 31 Dec 2019 17:00:04 -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=aDEGVgvk; 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=QUARANTINE 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 06ACA68ACD5; Wed, 1 Jan 2020 02:59:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 19E4B68AD2A for ; Wed, 1 Jan 2020 02:59:06 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id y11so36197236wrt.6 for ; Tue, 31 Dec 2019 16:59:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yl/sZ/E24u2Yy0lExop8LuiCBInbYtb1MDCCxFdpi28=; b=aDEGVgvkfrw2XV0d+CY1DpCAQsGEK+1yrbGDt7wyGx9pY/KUFMSgedhTyRufrilW2R xHwcbIzqgqnWeMweCMENNJ9jm/r+jtDLollnHZoTmRuMYZqvdOI9oBcimF2Nn2ck4tvt 08PEgjanU87OTlGmwfxxT7SuzcZUZOvQq7AIDSc8w0pScLkVb0dsdxEhzg0+T2VDru47 Rp+u3RyVw7rn4YKMbVXMPbTbQg5RpOJvxqhh8vCk514FQkWBrJEc0CCb6YSWTC+m/ucG f0azMMVs71jxCcyKismic11j4wr5osNJwmJLlR7lTUVV7Aqj75MV0M0DuXJ4oo6LZHch MaFA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=yl/sZ/E24u2Yy0lExop8LuiCBInbYtb1MDCCxFdpi28=; b=ttLcIbg8iz0xGt9zC5ss7XHitxLE1A2gHKr0AGnGd564Q57u1Rs0bhg/CgUdL8EZFE wlnCVaMxNL88Nk6py3cQ3ZJITv6rkiUD3oS/Lnu2uPbzEhuYtbqAJUVw+wfTBd2pGmiF p93ML15yXKj5Q8k5mnkmAuUtlRFOhK6tdI9nc49v/ERnQHto7kzIjfW/wXzxM3X8s/OD xwrjprQnfo/Y8DuPdXCvMGrmYaSsAwV3W9KvXET8m7CGz6rPVqk26A3qLdBbE5WSgqtD 1besbfY3ey/YfjbHCbUYdUozNW0V9/u0LgMM88W6tecLzTYE94zT1xL80BXDlt1asVgi O6ew== X-Gm-Message-State: APjAAAWOp/gChOeIlegPfUxPRS6Kz5J3Zs6WyFQErkoQy7QHvzlKcs26 5Jbj86VGczf3z9chQW9U8GwaBadJ X-Received: by 2002:a5d:690e:: with SMTP id t14mr73540637wru.65.1577840345516; Tue, 31 Dec 2019 16:59:05 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id w17sm52431655wrt.89.2019.12.31.16.59.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Dec 2019 16:59:05 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Jan 2020 01:58:23 +0100 Message-Id: <20200101005837.11356-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200101005837.11356-1-andreas.rheinhardt@gmail.com> References: <20200101005837.11356-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/20] avformat/matroskaenc: Check functions that can fail 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" X-TUID: rMHxNbOfaG4c Content-Length: 2351 Sometimes it has not been checked whether opening the dynamic buffer for writing Tags fails; this might have led to segfaults. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 8cea829b31..7857656309 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1557,7 +1557,9 @@ static int mkv_write_tag_targets(AVFormatContext *s, uint32_t elementid, ret = mkv_add_seekhead_entry(mkv->seekhead, MATROSKA_ID_TAGS, avio_tell(s->pb)); if (ret < 0) return ret; - start_ebml_master_crc32(s->pb, &mkv->tags_bc, mkv, MATROSKA_ID_TAGS); + ret = start_ebml_master_crc32(s->pb, &mkv->tags_bc, mkv, MATROSKA_ID_TAGS); + if (ret < 0) + return ret; } pb = mkv->tags_bc; @@ -1653,7 +1655,10 @@ static int mkv_write_tags(AVFormatContext *s) if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT) continue; - mkv_write_tag_targets(s, MATROSKA_ID_TAGTARGETS_TRACKUID, i + 1, &tag_target); + ret = mkv_write_tag_targets(s, MATROSKA_ID_TAGTARGETS_TRACKUID, + i + 1, &tag_target); + if (ret < 0) + return ret; pb = mkv->tags_bc; tag = start_ebml_master(pb, MATROSKA_ID_SIMPLETAG, 0);