From patchwork Tue Aug 13 02:47:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 14462 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 B6CF7447E79 for ; Tue, 13 Aug 2019 05:48:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A1AEE68ABF2; Tue, 13 Aug 2019 05:48:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6876168AB8A for ; Tue, 13 Aug 2019 05:48:47 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id y8so387686wrn.10 for ; Mon, 12 Aug 2019 19:48:47 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=iqCSsceReLBXCuBFgz7UQ1F+z4iYzhmeViPw0pVoru4=; b=N1p7x99tV91fHyspb6XD00myd0iV6bb9sW52Yse6Y/u6eIn6XQl1HZ1A4BR65GdvIe X4r5g1gyD/9Y/nAX4ALSiTDxIo9nLxTmPwIReKGABb/PE3p4a8ud8shASaI3LkPcnZ79 FhonAQZ99gUQdbMb7PBxsABtwkPt7eydbJ15/62aZ8fZzarzoJ+YLv96nLYwjLTjWZiz NpcVU0JZHsicDOonwA82EVp6Jd+hOUVpu0ZYDQhLrESZ4TbHsOzSwUxtMdIVKMJ5ps3C 2SrZnDNAEjbIOu4X/wRXjR6Qw9Wp18YZQTpbu4NmrNvvcWR+H6QPB+/qDWLxmlpkrZ/S 7Brg== 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=iqCSsceReLBXCuBFgz7UQ1F+z4iYzhmeViPw0pVoru4=; b=YDBVuE8pfb4XkyyUmSapW7i1Ra0WginVYmZP6PWDcz06qvnSXhjHobm7iZJy2BlUtG qFs2UnjPdfa1bmAIw5EUOoUD3V9o3y8HRR1F4fE2Yw8diYU/TNQ1y9U6aGSkYVTOIKI+ 413eTmUgobsu+pFJhqOWv5Y6wEUlMjCEb/QaaB/IPtlFzrHLxxE0aJuzg8gl4fcolt4K qoBEH81HOpsZyV1uZ7KTAlisbMJRtezChQchn3UuaPOG8dRxNBJNycAcjPB0CD9A+iFs c6gxYmeNPwMP9cgaz+peCT7TEmDZmw1APH/BwVR4Nke5qhOyfmQF501ih3q38A0Jvh9i zbmw== X-Gm-Message-State: APjAAAUKTXtaWjxlq3WITrvtaiJFTIprV4aue8mMz7Vo4Dj9ejikOhww oTuKFbfO15JdynIMG1ZAn+3+N8CZ X-Google-Smtp-Source: APXvYqxWA4zItK5YvI4g4moBSYyM+8LhqalXcUSDUFW1j+wALjTyBOKwIuVYjm04FcuWxwU7MQxtSA== X-Received: by 2002:a5d:50cb:: with SMTP id f11mr21783898wrt.277.1565664526763; Mon, 12 Aug 2019 19:48:46 -0700 (PDT) Received: from localhost.localdomain (ipbcc06ceb.dynamic.kabel-deutschland.de. [188.192.108.235]) by smtp.gmail.com with ESMTPSA id k13sm25020613wro.97.2019.08.12.19.48.46 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 12 Aug 2019 19:48:46 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Aug 2019 04:47:18 +0200 Message-Id: <20190813024726.6596-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190813024726.6596-1-andreas.rheinhardt@gmail.com> References: <20190813024726.6596-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/13] avformat/mux: Only prepare input packet if there is a packet 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" It is unnecessary to call prepare_input_packet if there is no packet as it doesn't do anything, except when the currently inactive code guarded by !FF_API_COMPUTE_PKT_FIELDS2 || !FF_API_LAVF_AVCTX becomes active: Then attempting to access pkt->stream_index will crash. Signed-off-by: Andreas Rheinhardt --- libavformat/mux.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index 4089382ffd..44ce099cbf 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -763,9 +763,6 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) static int check_packet(AVFormatContext *s, AVPacket *pkt) { - if (!pkt) - return 0; - if (pkt->stream_index < 0 || pkt->stream_index >= s->nb_streams) { av_log(s, AV_LOG_ERROR, "Invalid packet stream index: %d\n", pkt->stream_index); @@ -879,10 +876,6 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt) { int ret; - ret = prepare_input_packet(s, pkt); - if (ret < 0) - return ret; - if (!pkt) { if (s->oformat->flags & AVFMT_ALLOW_FLUSH) { ret = s->oformat->write_packet(s, NULL); @@ -894,6 +887,10 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt) return 1; } + ret = prepare_input_packet(s, pkt); + if (ret < 0) + return ret; + ret = do_packet_auto_bsf(s, pkt); if (ret <= 0) return ret; @@ -1189,12 +1186,12 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt) { int ret, flush = 0; - ret = prepare_input_packet(s, pkt); - if (ret < 0) - goto fail; - if (pkt) { - AVStream *st = s->streams[pkt->stream_index]; + AVStream *st; + + ret = prepare_input_packet(s, pkt); + if (ret < 0) + goto fail; ret = do_packet_auto_bsf(s, pkt); if (ret == 0) @@ -1207,6 +1204,7 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt) pkt->size, av_ts2str(pkt->dts), av_ts2str(pkt->pts)); #if FF_API_COMPUTE_PKT_FIELDS2 && FF_API_LAVF_AVCTX + st = s->streams[pkt->stream_index]; if ((ret = compute_muxer_pkt_fields(s, st, pkt)) < 0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS)) goto fail; #endif