From patchwork Thu May 19 23:43:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 35843 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9992:b0:82:461d:f3b with SMTP id ve18csp331429pzb; Thu, 19 May 2022 16:43:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx2gBNfAyeUkzIJfbA7uARZxSwEnZKD60yAysvk9PRlsrcIATDvJzcPcGV4vt4ndjxWvUS1 X-Received: by 2002:a05:6402:50d2:b0:42b:2bf0:4dbe with SMTP id h18-20020a05640250d200b0042b2bf04dbemr649775edb.309.1653003806485; Thu, 19 May 2022 16:43:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653003806; cv=none; d=google.com; s=arc-20160816; b=TYIwgbBUivk3CbK+FLebfMw2ihLJIoJ2upuMV5WzKnqAfsbfSvmQwME3KstWwLXA8J Pj1KuAOIEHjWwrK4dltNYmHQ6xnJGmaFQq09JWWvoWkFJlEccnDhdG/12rqV08tBw0Vq u/Fd5fAt6Ipt1zbUyX8oXh+G5kLHi7xpyje+arb5PEmyncNF7MulfyPRkkCn4+MHxO32 OkouAbZl9nW6+eB5HB4ZzNVFZxSEECA86qzaPnjHk1/f6KuK8hgqIWe96Ec7/HZ4nUhI zaq4+NZim/hqqPkQraObv0Ecfr+WFa4TNAHmtBFUoxiVG+N4lT8ybTYTD3AsfRIzxTED KQkw== 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:delivered-to; bh=ND8aGPSFlY8gtWHQeobcRoR0LDlOA/4ktAlQuCbE57w=; b=Q9wCRTIKjH3dWBm8OhhyHWyRZ0rFRAbe2bsLkBc+QKWEjvg8kXcGXR5a0Ha9MJ9LIl GZ45JKmQoi3uF2McBbRUs9CQPAMR271xTe4Kle5BavSRfwrv6z5sfPhXUxFXltyKxU32 xgDVVdleq8NZyvD2O9OeDegobFckH4sTDGDZ21AVTDkLsiA7spyAHVmDQuFIQ3Fuxk80 hnzaJRS+g+O5wnVfffz8lM26+Te+bZZQGMgZf+gYv+0jh7ePxJ7penpWEcbgxvwTkpnO AUujuM9ei/6z81v2AMF3di+AkUrPaBUqGLwQ40zFusQPZlgzlMoAfh4BQfqQWMcKt9rE FzKg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id an10-20020a17090656ca00b006f49f9f5957si6182974ejc.290.2022.05.19.16.43.25; Thu, 19 May 2022 16:43:26 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A48D68B4D7; Fri, 20 May 2022 02:43:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at02-2.mx.upcmail.net (vie01a-dmta-at02-2.mx.upcmail.net [62.179.121.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C56E068A708 for ; Fri, 20 May 2022 02:43:15 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nrpnW-0008Z2-8s for ffmpeg-devel@ffmpeg.org; Fri, 20 May 2022 01:43:14 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id rpnJn82Zn8s8UrpnVn9BWD; Fri, 20 May 2022 01:43:13 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id rpnUnjVwC8eSWrpnVnwbsy; Fri, 20 May 2022 01:43:13 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=6286d611 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=9zACHkxo1Dco4ITghHYA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 20 May 2022 01:43:11 +0200 Message-Id: <20220519234312.11733-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfOcGCgNs9ziZ+If9T5d0M0dFkfRfzz3lnjPULvgZZFT5nQ8sS6mfgwVtq1qWw/2Bvxy/fP8kSkilTzbrrkSqHdNjWn8BkDJQB0GgOsc+Vygjaxl+TEyS sRvmky78CsM1d+B/E7nhX5EZjZ9l6jHDhnLhUBtdYIsFzkqJqjgT/WQApgSU14uO45ht4fEzKHGFxg== Subject: [FFmpeg-devel] [PATCH 1/2] avformat/matroskadec: assert non NULL buf X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: yJyx2E5VHgBG The code is only called if size is > 0 so buf should not be NULL Helps: CID610554 Signed-off-by: Michael Niedermayer --- libavformat/matroskadec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 4715f1b7d4..de73f97aca 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3701,6 +3701,8 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, AVBufferRef *buf uint64_t num; int trust_default_duration; + av_assert1(buf); + ffio_init_context(&pb, data, size, 0, NULL, NULL, NULL, NULL); if ((n = ebml_read_num(matroska, &pb.pub, 8, &num, 1)) < 0) From patchwork Thu May 19 23:43:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 35844 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9992:b0:82:461d:f3b with SMTP id ve18csp331791pzb; Thu, 19 May 2022 16:44:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJybfl9hC593ElxbPHrmRxVFWjrOvgHUtWLsu6iZpRojHqsQO7SK2C1H/vv5J8blTxhI92B0 X-Received: by 2002:a17:906:58c3:b0:6fe:7d3:a6c3 with SMTP id e3-20020a17090658c300b006fe07d3a6c3mr6193481ejs.317.1653003862689; Thu, 19 May 2022 16:44:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653003862; cv=none; d=google.com; s=arc-20160816; b=txQmezcAB07+OEKANt+zQYfVlKe7Ui9/BqhHgk0amtajwn81KssVpWGIDBeYOoX3F/ r1U/YexcfEPlRQeELoNmGegEWuSvIUxa/sNDsSb448fWDG+MUsbM32mzWoc4YwuKYuhy CJlrAjSz3EeV2I8tbkWJcyRHb2H65vGI2uvuMBuj9FeUhG7M6XHeNrbLRIub3beHWsY3 +XijHTpFm7H/lzyt373hVWQxhrqFC66Webt7gI73T3dbgPXEJXTKx0TAzUsF4B/irUDK ojaFFTI43hL9U38o3Krkyq68XZZ3q5ORBiho9ToXXrSf77MZaToSrb3dhjD/gae+f2of rkBg== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=F/b7wkHy6yc5HFc6kDHs+uuOsxEsoCf7hF38rBg2m64=; b=fcLqTCAaamu3sNCH5QAmcb/3Km3Q/TGIzjCK+ym21uF1ZrIxVTHiIPgLl0lUH3mB/1 g61bPG5iP6SlS5dnkmcnyKC4fXmzI5x1Ustc8DEo4UGc2W5ivrfhZp1BE+hQTb78ONx7 FkMnc6VSHALZalceE2GWInflWCSMx0ip87cBsyTabNF78bUb+ZAkPDWO+SJtOv1eJyZP /zXNPqBNnFCIXhuY6CAEAtPNgSnA+MTqwDrmnIKpoaLIbAN00yQQDIoEspy5mor36u4X crR89MfTF6+MjR+PfAS1D4OkwBDifD+JrZkkABeguYHl3p2n5pt969opOhbZ7YzNnOFo a0UQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g8-20020a1709065d0800b006f3b19b0bb9si1430960ejt.89.2022.05.19.16.44.22; Thu, 19 May 2022 16:44:22 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 62C7D68B505; Fri, 20 May 2022 02:44:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at02-2.mx.upcmail.net (vie01a-dmta-at02-2.mx.upcmail.net [62.179.121.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7FE5268B000 for ; Fri, 20 May 2022 02:44:13 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nrpoT-0008Z2-1j for ffmpeg-devel@ffmpeg.org; Fri, 20 May 2022 01:44:13 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id rpoHn840H8s8UrpoTn9Bd6; Fri, 20 May 2022 01:44:13 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id rpnVnjVwL8eSWrpnVnwbt1; Fri, 20 May 2022 01:43:13 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=6286d611 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=slYeRps0ubxdpvCUR7gA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 20 May 2022 01:43:12 +0200 Message-Id: <20220519234312.11733-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220519234312.11733-1-michael@niedermayer.cc> References: <20220519234312.11733-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfLJrGUaOHHulyBd8LC2iXMrkABSgjym1GEwsQnXcFsCoANcT7qJkom+wyp17c1GfdpsJiqIIrsYik98iOXDlVkbFX79Qp4UNnv+r5zXhYVwFHDq12KKH ASXS7O7fjeVh+JLhBXAoQ91QT7IHRYkqtqn5sCefZwBUw+F+QIIzYhjHtbdLpw7q8BOV5emv8qSaRg== Subject: [FFmpeg-devel] [PATCH 2/2] avformat/rtsp: break on unknown protocols X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: YqMO7hqt0auV This function needs more cleanup and it lacks error handling Fixes: use of uninitialized memory Fixes: CID700776 Signed-off-by: Michael Niedermayer --- libavformat/rtsp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 88e9ef5226..f948f1d395 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -949,6 +949,8 @@ static void rtsp_parse_transport(AVFormatContext *s, ";,", &p); } th->transport = RTSP_TRANSPORT_RAW; + } else { + break; } if (!av_strcasecmp(lower_transport, "TCP")) th->lower_transport = RTSP_LOWER_TRANSPORT_TCP;