From patchwork Thu Jan 23 16:08:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17494 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 0079344BAAD for ; Thu, 23 Jan 2020 18:08:58 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DE30568B49A; Thu, 23 Jan 2020 18:08:57 +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 E8BEE68B319 for ; Thu, 23 Jan 2020 18:08:49 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id c14so3692618wrn.7 for ; Thu, 23 Jan 2020 08:08:49 -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=I6R8A5mwx1J2WWtMuFft7UjGxpUu5Rc49vVVkwLtmtE=; b=A9MbTTaxBaabUlfrFPuyO7+/ZZy7/mjUVXvepz4OSEc1EIBtx4LuC6zYYNGLyLU0p9 e7gTPyT2LuN7yNOj5QEuunRsj5odj/gkTjjUSjBT9vVQR8+w9Ey81BSxmhaL2+PwavhS DvqRphv5UhIPQ2Cs1H3xBbVpnv6W4viglvzOEpd1nr1AkuVIDLLYsJnyyOLQWygkAFW9 1y3SGkKuXg4snnVUc8xM9lS77fiselfIhhGaOQ8YhaPr7eZDWMePL9xaIhyFHO/qJv6T 9bq42JE4pl16e8xc/wPug4J/JPOKtOyVj1DeSTUUlCMbuFFIT0MNDsU86vlVaFHyd/8p jyFQ== 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=I6R8A5mwx1J2WWtMuFft7UjGxpUu5Rc49vVVkwLtmtE=; b=U4k8AEnNkQHjeBtogdcpEz4nQ2VweZmz7i2O2h4ouMfI4CnLdeksB35A3gYHQniSbJ H3BjoQY8vpJAvwum+uwaXnkS2VMXBDnD03uTvA0rOAfxKy+GjjIv2YHg7KyxWlU3VMRz qmdzaxc9ECYPMGJPiDA+ZcXW3gPYU4FGXjVafolkfqPTeicJaoEq0U3j6Buw9LJZz887 BrauQTwSEHF2XcQLWJaNN0+TF4U6ot8JI/b5kIPddDJtXt+nhxGaf8O88ZwCqYqrjoJ7 lIF+RgsSR8CTFd5BvXuQFLD0GkMbWIWSPfBYvKXIqbblqwhrWwlmHaR1IHQeUHF+AldQ Z7aA== X-Gm-Message-State: APjAAAXuVPE6Ts0muD5LxeShZl7sE1jCj4Mht4lGlPryJKpgZ/jaG+om l9Cy/3oc3CkGDUejB11Z9kJU7cn1 X-Google-Smtp-Source: APXvYqy8rjxMImdfzEs2CVScAI9ELnfhUJIpgRe6FePW1BG2WZ+J/oHxqCZfGThlRys2Z/yQDr0gsA== X-Received: by 2002:adf:ffc5:: with SMTP id x5mr18800865wrs.92.1579795729271; Thu, 23 Jan 2020 08:08:49 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id o187sm3678419wme.36.2020.01.23.08.08.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2020 08:08:48 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Jan 2020 17:08:31 +0100 Message-Id: <20200123160832.2020-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200123160832.2020-1-andreas.rheinhardt@gmail.com> References: <20200123160832.2020-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/6] avformat/movenc: Check for reformatting errors when writing hint tracks 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" If this is not done, the avio_write() calls will cause segfaults immediately afterwards on error. Signed-off-by: Andreas Rheinhardt --- libavformat/movenc.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index fb44ee2c71..b5e06de3d5 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -5461,8 +5461,10 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) /* from x264 or from bytestream H.264 */ /* NAL reformatting needed */ if (trk->hint_track >= 0 && trk->hint_track < mov->nb_streams) { - ff_avc_parse_nal_units_buf(pkt->data, &reformatted_data, - &size); + ret = ff_avc_parse_nal_units_buf(pkt->data, &reformatted_data, + &size); + if (ret < 0) + return ret; avio_write(pb, reformatted_data, size); } else { if (trk->cenc.aes_ctr) { @@ -5479,14 +5481,19 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) (AV_RB24(trk->vos_data) == 1 || AV_RB32(trk->vos_data) == 1)) { /* extradata is Annex B, assume the bitstream is too and convert it */ if (trk->hint_track >= 0 && trk->hint_track < mov->nb_streams) { - ff_hevc_annexb2mp4_buf(pkt->data, &reformatted_data, &size, 0, NULL); + ret = ff_hevc_annexb2mp4_buf(pkt->data, &reformatted_data, + &size, 0, NULL); + if (ret < 0) + return ret; avio_write(pb, reformatted_data, size); } else { size = ff_hevc_annexb2mp4(pb, pkt->data, pkt->size, 0, NULL); } } else if (par->codec_id == AV_CODEC_ID_AV1) { if (trk->hint_track >= 0 && trk->hint_track < mov->nb_streams) { - ff_av1_filter_obus_buf(pkt->data, &reformatted_data, &size); + ret = ff_av1_filter_obus_buf(pkt->data, &reformatted_data, &size); + if (ret < 0) + return ret; avio_write(pb, reformatted_data, size); } else { size = ff_av1_filter_obus(pb, pkt->data, pkt->size);