From patchwork Sat Jun 8 23:10:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49709 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1781634vqo; Sat, 8 Jun 2024 16:10:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX+D7PL4kbbHlBHahHduwmLR9aqZhU9TSUy3Ky2JttTdfHr913OP0OgRwCXm9Dlr1REw5iB0TvD19YvIPDifw7ZJ1IuCGKcOJiFAA== X-Google-Smtp-Source: AGHT+IHxnLawcdkbRCff6A1NMIQtCevXH2s6ff4o3UsyxYWPkz3Mk+0Hinif00NAyZCLEok6UVhn X-Received: by 2002:a50:c047:0:b0:572:2efe:4d14 with SMTP id 4fb4d7f45d1cf-57c4dee1736mr4949560a12.10.1717888258525; Sat, 08 Jun 2024 16:10:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717888258; cv=none; d=google.com; s=arc-20160816; b=yDIEufgAH+V549TstVykde3NpvBDlkPmQ/iHcKL8L14ltI0MHXOo13ZcILhsHklowc QZMSL3j3TrIqYTD6gcHFgj0jf3/aXk89dIiZfeECQp+HVKSB37e6NIlwYE+1di44p6kM oG97XbD/Uh5lahZ8APEFdNYwM+sWhFGe0wcVPH1UXJyl8912EiXuGNWwDHYH/tpr0+c1 7E48wnIvfxd7UoWluBuSTBroSOh69kS79+A6KE8FwUnC5opvn5YuHRpGvKluSsK00rav mwJV5WQKtS3Sw1BIBxgGlmDTC6RGIWSqqUAnmO0nrnpZZYk7ROX0YVNBG1RjEb0u/+Na DJ8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=3wIYs2DzNIFab7w6k51I9wiWTe8j4ZdvYAkZt/cvHIA=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=Sgydc4H3MIX/XR41wD0bXRfS/T3pNlYl86W06mp2YzXsLHQao8of+LndL3iVg3jwE9 d2d3KDfK5N9re6xNYTxpF/g74MJSGJ6fEosoVhAuEjThGKdkCKhE7Ljn8wihjfvArwYK qPAxZkiT29prXgACDXmOfmjxgVdvUIVyaWsbTzN/tYmEQ8cT3SC1YwpWmgmPTO/o9lKH 98BnvgRmokPmJv+lHTIrfo740uhToKLRdPNEpk+Av0Nndz0XSlMls7IFj3M9Ftep2BnT bJEIvyb96RjORbF4EO+NzIAH+ZGLAwy2ds2h2JKn03IBsk4v2xhJEHxFSZzHSOM3lxCp xwoA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=WXPoiX00; 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 4fb4d7f45d1cf-57c60c5b41esi1671456a12.593.2024.06.08.16.10.58; Sat, 08 Jun 2024 16:10:58 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=WXPoiX00; 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 D640468D709; Sun, 9 Jun 2024 02:10:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71F5068D674 for ; Sun, 9 Jun 2024 02:10:48 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 715C7C0002 for ; Sat, 8 Jun 2024 23:10:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1717888247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ezpw+KvqPW4Bmo4LuYDvCRbUsw8AlPB2hCqXKssqt8g=; b=WXPoiX00jmbznS7umV0OFjgcE6vO4ci5FL26bKSoLECnqVhz+/35/OIV4G0bVkFgcuPlHi 55PzlNSjc/8NwLd5amHFK0rzfyUZwFPKmyozQueXgp2eo93dkSN5tUmDV+RktTqgK32wmq uuDUgvhXKj30RLmXVkszruRivJ64mbtUSYjt9piiSTgyWmqjtY+ptscWyOw5RJsut6NHVN L4XYrLxY0d73J8zDC1ohiHY94gJC7Ww+o3iweQX3RQGOP5eHyb07vuTYvpT3yN4XQ+u1N3 GM0HFplpLUZxs7IK5FgXlz2NNFtW7G5JtIrz8yKFsw0S+Ltg74FJfCr6x01ZoA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 9 Jun 2024 01:10:38 +0200 Message-ID: <20240608231046.3619551-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/9] avformat/rtpenc_vc2hq: Check sizes 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: uLNM7JAR00qs Fixes: CID1452585 Untrusted loop bound Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavformat/rtpenc_vc2hq.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/libavformat/rtpenc_vc2hq.c b/libavformat/rtpenc_vc2hq.c index 085204fa646..cf548191d2e 100644 --- a/libavformat/rtpenc_vc2hq.c +++ b/libavformat/rtpenc_vc2hq.c @@ -45,7 +45,7 @@ static void send_packet(AVFormatContext *ctx, uint8_t parse_code, int info_hdr_s ff_rtp_send_data(ctx, rtp_ctx->buf, RTP_VC2HQ_PL_HEADER_SIZE + info_hdr_size + size, rtp_m); } -static void send_picture(AVFormatContext *ctx, const uint8_t *buf, int size, int interlaced) +static int send_picture(AVFormatContext *ctx, const uint8_t *buf, int size, int interlaced) { RTPMuxContext *rtp_ctx = ctx->priv_data; GetBitContext gc; @@ -54,6 +54,9 @@ static void send_picture(AVFormatContext *ctx, const uint8_t *buf, int size, int uint16_t frag_len; char *info_hdr = &rtp_ctx->buf[4]; + if (size < DIRAC_PIC_NR_SIZE) + return AVERROR(EINVAL); + pic_nr = AV_RB32(&buf[0]); buf += DIRAC_PIC_NR_SIZE; size -= DIRAC_PIC_NR_SIZE; @@ -97,6 +100,7 @@ static void send_picture(AVFormatContext *ctx, const uint8_t *buf, int size, int send_packet(ctx, DIRAC_RTP_PCODE_HQ_PIC_FRAGMENT, 16, buf, frag_len, interlaced, second_field, size > 0 ? 0 : 1); buf += frag_len; } + return 0; } void ff_rtp_send_vc2hq(AVFormatContext *ctx, const uint8_t *frame_buf, int frame_size, int interlaced) @@ -110,16 +114,21 @@ void ff_rtp_send_vc2hq(AVFormatContext *ctx, const uint8_t *frame_buf, int frame parse_code = unit[4]; unit_size = AV_RB32(&unit[5]); + if (unit_size > end - unit) + break; + switch (parse_code) { /* sequence header */ /* end of sequence */ case DIRAC_PCODE_SEQ_HEADER: case DIRAC_PCODE_END_SEQ: - send_packet(ctx, parse_code, 0, unit + DIRAC_DATA_UNIT_HEADER_SIZE, unit_size - DIRAC_DATA_UNIT_HEADER_SIZE, 0, 0, 0); + if (unit_size >= DIRAC_DATA_UNIT_HEADER_SIZE) + send_packet(ctx, parse_code, 0, unit + DIRAC_DATA_UNIT_HEADER_SIZE, unit_size - DIRAC_DATA_UNIT_HEADER_SIZE, 0, 0, 0); break; /* HQ picture */ case DIRAC_PCODE_PICTURE_HQ: - send_picture(ctx, unit + DIRAC_DATA_UNIT_HEADER_SIZE, unit_size - DIRAC_DATA_UNIT_HEADER_SIZE, interlaced); + if (unit_size >= DIRAC_DATA_UNIT_HEADER_SIZE) + send_picture(ctx, unit + DIRAC_DATA_UNIT_HEADER_SIZE, unit_size - DIRAC_DATA_UNIT_HEADER_SIZE, interlaced); break; /* parse codes without specification */ case DIRAC_PCODE_AUX: From patchwork Sat Jun 8 23:10:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49710 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1781672vqo; Sat, 8 Jun 2024 16:11:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXVzrZxTcz3l+36HfnCpaePdv8phFVNSe3OlcxTF90Mdh5fDCpYis+bYY1dsLaIO0RbcOOOQ9LyTvQCqiyt7prLBpVPPn5uNmNapg== X-Google-Smtp-Source: AGHT+IEowZNt+OgzWoffiScI2fKPVIG5ZFyKguHEYBT1N9g/+ZTOpTEw8i2BVopjAuFYUDcI8fxa X-Received: by 2002:a05:6512:15a0:b0:522:2a2c:759e with SMTP id 2adb3069b0e04-52bb9f5de1bmr4924252e87.6.1717888268780; Sat, 08 Jun 2024 16:11:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717888268; cv=none; d=google.com; s=arc-20160816; b=zzwXZsUW+yQ1x4Pg6j61FOU416fICexpq5LrbGf1jkJ6wbrWWkYHEu0jDGAOjwqYE+ D4I2r8XlMViIaO7gixTiiU6h+4uf47ThDG2059n1xfBPa752T0b+UEDcMKGAlcKvWV27 BMAdpSKx1M3LMgM/CfXxnCvWpiKy5cRqtcSyfI0lJ9QT0QfLV3jWU6OmQKDOlfkx3eKE xybCTYlR8JoAIw4UeQGkARCiItzG3mrvrVRKDNJcjqZToCsgjjxA8MD4jZV3d4gKZa0V u8jLhdsSsQxY9Zis+f7ct1xyJVxqxcw+q5I6+DHYwhY7Gf6tSCbQVgaQg47CXyB1EvqC Wk1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=aSjPt664TvAPUebO9yt9Fxt/qTgjKThe69UnKwEUKtI=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=bvmH//i1udQO8h/U6sKuhFhYnS7aGNql764tug3rhmJDqPkiKtcxPRp6EWV9G5vGNI oDb8jD+BkRpnKLRbUMKjGimVQ9vtQKxLoqwOBvyIrlTGoBSyk8N9S6L4k8oPCW3Vj5N2 R9a4GuXWcO+6Fw7L/htuQLso09ufCDapAbV/eu3Kz4W/G3ikxxYkbqZUo4/jQu2j0nOP vyPucW8rbR5m/QzS/y3EaqgoQ+Ra+OeoU88jDS7oaUGKuQSO4ye3eO5/GY4hPslFsI0M wW5Bg0pQ5grZrsDbMLwHMoFQYaZHbcBnOhYXY6tioqTC/058yFPHXaaeSgsmWvXJgNtG vBLw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=OLeBvZei; 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 a640c23a62f3a-a6efcbf7f50si116773666b.89.2024.06.08.16.11.08; Sat, 08 Jun 2024 16:11:08 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=OLeBvZei; 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 1032A68D726; Sun, 9 Jun 2024 02:10:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A33F68D709 for ; Sun, 9 Jun 2024 02:10:49 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id AADEBE0002 for ; Sat, 8 Jun 2024 23:10:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1717888248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uOjFkGXjUuIh4YvH2v3HgmrWO8bZ0Eq9e6+E73eIUiw=; b=OLeBvZei2hd//hSj708Jk9GXbe4mUm9c/kzhrIZcQoLlOwTCAT9+NzOTx1CeyJcV+MJkPs DkXjir7mrSTpwN7gfentTwoJCqdoKJJrASPOI10DXCOJZqD8LNzavLHISgxpFblLSNIRem fYjuKFencWmr/33aKOTw55FQM+oAxfcCE5dzcPaxWHKm/x7jwqELOIMhhF0dKAOQ1l21J7 5T5XEMMGIqi0C83nmLW4tD7E3zrgfXTEO153CzmlCwDOqRP7x3jW2jUxjuFJGKkR3ARLfS RTPsZwobtNVaS27os9dlm59joZo9uzLhgckzvPe/zQCBEKzNJ8buEBDWS5kX1Q== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 9 Jun 2024 01:10:39 +0200 Message-ID: <20240608231046.3619551-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240608231046.3619551-1-michael@niedermayer.cc> References: <20240608231046.3619551-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/9] avformat/rtsp: use < 0 for error check 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: juFS+DPnxLNT Found while reviewing CID1473532 Uninitialized scalar variable Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavformat/rtsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index db78735c7ae..28c858077ad 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1429,7 +1429,7 @@ retry: cur_auth_type = rt->auth_state.auth_type; if ((ret = rtsp_send_cmd_with_content_async(s, method, url, header, send_content, - send_content_length))) + send_content_length)) < 0) return ret; if ((ret = ff_rtsp_read_reply(s, reply, content_ptr, 0, method) ) < 0) From patchwork Sat Jun 8 23:10:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49711 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1781721vqo; Sat, 8 Jun 2024 16:11:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVqs0Zv8NM5Lys+kxDahToi9/uV50f+7YqGDj/OPLJjxwzyFk9TWC0Qj8x5lHoh26nXGsh8u6uYfeI5Y++XrJpiXBsBi1Cyv5IRzg== X-Google-Smtp-Source: AGHT+IH88BMLnvCCrKyQoKFB8VnEjatC6+LGqOr3Us14gafLXsp0s1gidp0d9cSfyQwQy8ImfQF0 X-Received: by 2002:a05:651c:2126:b0:2eb:d95f:10bc with SMTP id 38308e7fff4ca-2ebd95f1469mr17601531fa.10.1717888278163; Sat, 08 Jun 2024 16:11:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717888278; cv=none; d=google.com; s=arc-20160816; b=eFu5b5WRku/SnmoZDrD/YyiiW3R/F5r2Vxdw+ZHn/enendz99OwfgJcwBVXAUc7qbH 9y2IhCpGkXJBGg/ydPhhHqJWcBgb1e/xMLqQmdQmuAp1BUfolPg/eRUOKh7cPmkqSwFS Yrj+U9DwgeFr220OlZPahbdXZql4aQomllbKoyZ9HgmoGUh+qKIyb4QrwbsDoEpK4lM8 VYLWE2T2/19P3hvtKrEt2CvilJoN3jh9jH+mNYJKmeSc/UE6eeP/AeFObBTBCuuji1XN l39VEI/SFQTMybYaoReP2mZQyMP5xSf4gIeJt1D2Z+PN9p7t+e6vcMaJlZEWkRSzTO0E gzZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=mRhUlnneOPcvH0UXtOBKdHmxXnaCIlfpREjfK9EyPw4=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=qs723xIDogWKCtBvcXf7ybTc5MiHEx7WR70fvFOOx/3i+8yJ1N293Y4BBoQJSvh9Oo a7jjf5Ut1jsJyAHPdKm873n3ovYg/b+rbuvUYBDaYG/u6AIfgv4KxwtnMF4cTa1dlUNN bzAO7rgOLiMogGhrMLS2+jIEcACDVimZuLP022nOZAGUT6oE9NjL7TwnKYr+71DSZEsb YkQdN52iVCeueupYQgwTht/Wzg/d9HGnuC9yXwcYcttefvDS6YBXPw26vqTWeiz1QYdi QyDZcZsL8U+izsQ368qkdJlLCLjOv8LJ90B03aODdBCBaZ8noEVYRjHXNh+v3SXRImOV ieCg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=iDjgOKyV; 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 4fb4d7f45d1cf-57c74eb06absi355967a12.110.2024.06.08.16.11.17; Sat, 08 Jun 2024 16:11:18 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=iDjgOKyV; 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 74A9168D674; Sun, 9 Jun 2024 02:10:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1346168D718 for ; Sun, 9 Jun 2024 02:10:50 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 7266EC0003 for ; Sat, 8 Jun 2024 23:10:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1717888249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vkvTnVm2OnJ6FS00fMThIkQnzeA5KsUktMLm8B+LnFM=; b=iDjgOKyVfnenkJ2zZbta2cOFg+VGFT0cDevYf5dLPezKLl+QNtWwoKowmD7w3+d5bcMWz1 DNZHvgx/ue0Usb2Ha2JCAy4HqBYvolzPIMXE5/RXiMaqOSb8Ad8FJvCkcSeYPvNKMm7RFt nV1rr1554qRTsHxvt8OOyxbypY1HYp0f1LpbFJyLD4ikKcrPE1w9PuJkB+iVCmNWIJ+kWY gZgWo22BB1PY+n5h42Fc4+MWkLFyW+yXy+gwEsNQje/x37SvKSj6Fo1Q5xYexfxCXp6bwI UdghV3I1juZdMpg6Uwt65i9ypz/8hiJYPTtZLhHVU5J/st/wmx0Isihfe9CfxQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 9 Jun 2024 01:10:40 +0200 Message-ID: <20240608231046.3619551-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240608231046.3619551-1-michael@niedermayer.cc> References: <20240608231046.3619551-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/9] avformat/rtsp: initialize reply1 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: NAkijBKgaCrc It seems reply1 is initialized by ff_rtsp_send_cmd() in most cases but there are code paths like "continue" which look like they could skip it but even if not writing this so a complex loop after several layers of calls initialized a local variable through a pointer is just bad design. This patch simply initialized the variable. Fixes: CID1473532 Uninitialized scalar variable Sponsored-by: Sovereign Tech Fund 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 28c858077ad..c6fca89d83f 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1462,6 +1462,8 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port, char cmd[MAX_URL_SIZE]; const char *trans_pref; + memset(&reply1, 0, sizeof(reply1)); + if (rt->transport == RTSP_TRANSPORT_RDT) trans_pref = "x-pn-tng"; else if (rt->transport == RTSP_TRANSPORT_RAW) From patchwork Sat Jun 8 23:10:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49712 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1781756vqo; Sat, 8 Jun 2024 16:11:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVWxHu6KsZ8+N618+KKLZzl5Zmcgix7o7keDV6UC4/HRWF6UGqNZzavJ1BQwtrHvTDTeTSroNlSdJWWBcTs2Afwbr+OqY6jZpJOlA== X-Google-Smtp-Source: AGHT+IEKO5kmp+4EHxBmPLJHYqmnBKjfFdAFlye/zaMXxRWeBM+OOTlzKhfzOCCfuq5Rtd3yJslL X-Received: by 2002:a17:906:553:b0:a6f:1533:b811 with SMTP id a640c23a62f3a-a6f1533cb56mr18155866b.4.1717888287638; Sat, 08 Jun 2024 16:11:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717888287; cv=none; d=google.com; s=arc-20160816; b=U+AzSjEek7HiIuNkprcpxJrxYSyIZtlbFQyLeHrEZPCvUMKfK/oAdBJC7Lz3nfbsTO 8GME1ZKAAIHgdMA2nD5Q29U99Onf7Tdt/Hky2ukSIocud3thWqAobEblRIBVa4J4iik/ vzML1aFpe19v8u/wWSmqKS0EGP61ntP8hFV93x+Y9/91M2OdgWvXgwC9gbrhpL+h5B27 C2mto35XkQzrmhAfF/JpzDoaSEng9pnS/wVKz48RkHWmYs/oUWj4qmARV8/9ZYAzLI6/ ZiDGy/VCdQNtIVaO2NousxxU/wU6yH3w8zu26+D9UJIVnvjXIfOe3QreZizoXdRYDZXl 7G8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=wk8rxyMoTe4oaH6fUuPszYY5W1vQ7oW+UaeltjjfC9g=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=I0OsMVHVG/haI+4yM3bStrLAqKVzrES5XAxnWUCtAfkREEcsO3qtJbG74VnYKMBjI2 CFwrpRYawTEMmGpK2ZQTbWPB3rPzTZWlDuJvcaI8wNvWGTIkIJrw1dTb+xNtESeb1kHL TZqIkrxw0YSzUscP6inb7QtFkYs5nTVThZJfiMmzR1zog1uszW+MaQ5JwTjgmAhsY6rN 1XidviqjO+1RdPd24P4BCTbUuQoxKjRFTHNM2sra7itfTH3wb+s55gjzSmdPoQp3EK/V lQjj/Ze3lqbbF2jOMlA6db0PTFLgYxYTWiuv5bIB8s3flspeOENlvl0iYyM36YVWiD/H Znaw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=iSkjzBkW; 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 a640c23a62f3a-a6f0e804abasi69072766b.676.2024.06.08.16.11.27; Sat, 08 Jun 2024 16:11:27 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=iSkjzBkW; 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 A060868D73A; Sun, 9 Jun 2024 02:10:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6123E68D71A for ; Sun, 9 Jun 2024 02:10:51 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id B35C420002 for ; Sat, 8 Jun 2024 23:10:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1717888250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JMXzDQ+wpahqKd6EC+hiDT9ElWpo1+tRASzF6xAReS0=; b=iSkjzBkWyHH7MDE0PFod17PNo97/tfWzzCX6rNIoTtSxrVPDZzDObz77nQ5rtH3wm/1rWT YcceBeQ58JC8FswP70PuaiOXsKUf5rvLyvipq/z3jqzfxPGo+72xfEh++prpFJAwkRsbuY wLf2a3npQxNmj2MYB73onGKYtkuR3o0YMaXSU/d6TAYwWFft8G+kgVaapejWrctrYYfPLZ JbEXX+gTTsclIJnFoUf/7di6cFZ5W6cWY75Ndv7nXCX2Vh0gXAr+66gaNQi98g1fis1eno YHYfHQ0Wt0e6d3adCIREM2P3kqeKBzdvPBGxzvT28bYnyqG7LEOYJFa+LNHsgQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 9 Jun 2024 01:10:41 +0200 Message-ID: <20240608231046.3619551-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240608231046.3619551-1-michael@niedermayer.cc> References: <20240608231046.3619551-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 4/9] avformat/rtsp: Check that lower transport is handled in one of the if() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: foYl2rhnWMCa Fixes: CID1473554 Uninitialized scalar variable Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavformat/rtsp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index c6fca89d83f..19b93df8394 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1578,7 +1578,11 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port, else if (lower_transport == RTSP_LOWER_TRANSPORT_UDP_MULTICAST) { snprintf(transport, sizeof(transport) - 1, "%s/UDP;multicast", trans_pref); + } else { + err = AVERROR(EINVAL); + goto fail; // transport would be uninitialized } + if (s->oformat) { av_strlcat(transport, ";mode=record", sizeof(transport)); } else if (rt->server_type == RTSP_SERVER_REAL || From patchwork Sat Jun 8 23:10:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49713 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1781800vqo; Sat, 8 Jun 2024 16:11:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVcU+n5ro+3WsRowDtIVhhH6J86S81nXR4IZfzKTg3v/k8FlTuE+41XcRkQ8Ndq7odCtTmszfHRaPxXaE2PEBCiRfqqlVJzXGkWhg== X-Google-Smtp-Source: AGHT+IFIs7fgMEXIML0Su9mMcH9tR5/TW+anSrYGWD79t1vFr25BwwWKx/ZMi3jDMt2wdmnViJH0 X-Received: by 2002:a2e:330f:0:b0:2ea:ebda:2b3e with SMTP id 38308e7fff4ca-2eaebda2cafmr25297141fa.44.1717888297162; Sat, 08 Jun 2024 16:11:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717888297; cv=none; d=google.com; s=arc-20160816; b=XSHseVREDYXCQ3+ifgn9Tk6UNYwXtpJW0tp6P7i+JN1/1eQkDUWcFgtQoZWLhOxLr2 PtSVgbN9ulmb+6+OGMvP24s4YFuouaon/9CPIrdeW1Tpljun5jyZtjDzMP2LhPmFdTUP IGSSe3ZofJV5dHvsewCokw2yX0/eav4iURoDjNqBqIJZq94KNkO3tRoGWRf+BD1CEFey vYNoa8Qylhxr09IjSYH3WDs5S+zWcE288uJxVxTEnW9XOwMUNIPdOko7bLHdNAy+le4o OFRGAWnn+RJnvzROZsvr2xpHazMLKVyCNVOi6vgHFnq+hZ+KIfCqE9u5d0Oi2JcQufFQ 7r8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=lTLfHyOX1kL5Ke2yF9mVovcq1MfxoHyI7XiW/xg/FHw=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=M9/aTUAINvP2C1D3ySRSufC0Pn4WLUdZqDpGHBi5ChiMY4GNy7rc8QD0ryvsppqeSL vk6KaC4kkfSHBYpktry/tLL0zs8zbBFzcTKdCRCdYi9RyWTE8rWPIcV+ngYHbO1YP6Cj dF4nL+GExN1NqYwHQ1ZQFdWj57E5zHF2GlDH2F4qz4MJP6+NKvBZjg1pT2rdClbf1TW+ 58VYojt4ztMrNxtYFjxLJn1DsNsJcOAx/l1MnPdVdb0+/Vc+b5DRl1CowPCtLEGuJ12Q 0DgRC/V+kfYhhnrPjaCk8ZF/UQoud4oAu5UzeCecT9vQEOl2V5oik+HejMSFt7RHE/C1 WMvQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=kEnu8drC; 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 4fb4d7f45d1cf-57c57219e8asi1973488a12.569.2024.06.08.16.11.36; Sat, 08 Jun 2024 16:11:37 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=kEnu8drC; 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 BAF2E68D748; Sun, 9 Jun 2024 02:11:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5859468D727 for ; Sun, 9 Jun 2024 02:10:52 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 9DFA160003 for ; Sat, 8 Jun 2024 23:10:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1717888251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ex3eEm2+7HRzzTpppyowHNo7UIfzDeBOIuaqKkg3YWk=; b=kEnu8drCEG5pzCf06w1C49uE/QVc4xz7K3Ep8yCc6A67EXKPFQksT747LnLBY+yytggrGX zjzOOf8U/2YcJz8xvtVD2Oj7Wxqxy2aPZHO4lcdmJ/M6W5puwNdUlGPnbGTqwjyZacEpDt lbxV/r7pFouds6eSHUZwd8IZWj+s/eQ3oMRYG1X/ikFa6u4yfFMXfLgRSgZQuvoISnzN4C w2gbzt5umLac+zuYH85haU+ByC7sHZwKfJVVXqmN3QhnAc2BCJIqWhExwR2O/f9JWnGkeP LPGf9+ZAM0QB/uCIGei8f4w/EBOjRhT07vOaV8AVX2asXQ5s6w5CA+VTK/PtKA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 9 Jun 2024 01:10:42 +0200 Message-ID: <20240608231046.3619551-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240608231046.3619551-1-michael@niedermayer.cc> References: <20240608231046.3619551-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 5/9] avformat/subfile: Merge if into switch() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ++HLdiIWz93A Found while reviewing CID1452449 Uninitialized scalar variable Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavformat/subfile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/subfile.c b/libavformat/subfile.c index 633a9e3c62c..eedac1524e1 100644 --- a/libavformat/subfile.c +++ b/libavformat/subfile.c @@ -123,9 +123,9 @@ static int64_t subfile_seek(URLContext *h, int64_t pos, int whence) return end; } - if (whence == AVSEEK_SIZE) - return end - c->start; switch (whence) { + case AVSEEK_SIZE: + return end - c->start; case SEEK_SET: new_pos = c->start + pos; break; From patchwork Sat Jun 8 23:10:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49714 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1781849vqo; Sat, 8 Jun 2024 16:11:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUXlNkAUl5hOqCpOw18FD6bGME3le/mBiuwaJ/pUBs5NSV78cd1ir8nXiMO282SKR0uV2OUgW5AyQLoFX7wo7dTDRQMEdpeQY8Shw== X-Google-Smtp-Source: AGHT+IFtx2cvl4tw8Ak/u8374BTeeo/2nUvnAWBDEDa6VziNOjXa1WkkHj8M+SRSAOQDFC+sxCyp X-Received: by 2002:a17:906:2341:b0:a6f:e55:ba1c with SMTP id a640c23a62f3a-a6f0e55cb79mr111881966b.14.1717888306052; Sat, 08 Jun 2024 16:11:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717888306; cv=none; d=google.com; s=arc-20160816; b=RBAUHT6+60RWeqDTndenpsuxDyvaXZwksg9hUdSBt7+fYXByzREQAQoVEzi3Eedwzn dOvGY62aNl+tJqUUKtsJEVthFBaRqu9UB7Rl/4356ICm5y0VQtOogWoRZjCZwSrNqtic N8s8+Hi6SHiGChColXZalZkFCCH3X9GXFdTQ92o7jzI5hpJ8JsaXIzgXldwsgvQ/zI1j d8vkIV5gBVNbMGqPpGvzoh/lWqsk1n/ysBIn+vPO/JsSTlpr70wG5KYU71LGYWdaIxtA TLuc9qUQlmgDPTp+w38OVm7KSF08/c1htPm1YujIRUMyKNOnD2WPGvULwYeLnlg5SmUo PAvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=wZTadj2AsOSXnCOF1/NSdrb3d/sL8PTJv5gpd5fIbVc=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=kZIVC1N0V2yEXiCr+D2pl8Q2/ubXfmVQxSnxebK+zM8xPClhQds9NEE+IGF7T9KQqD WBzc5p1tyKmQ2rcrvyWsaedtTScODppEA3H2ZVYDQFClvnQZCCy6D8RcdjOcyMa/XdUc cAdjGZEPhcNy/2+DGonDPVGr+7MIdBXu2NLH8WBNO+1gdSc/UD6BUWnQVQCeMMOpC/Js /JJ/qGMxEiuw35FTCg2KDL74cIFun6jla2ZfnvH6tCVK6AbNTPcp3+EGv0zJRne1uVs4 rZO3dqvi50O9D2EMJ2XtvTug6gtHt00jmew1l9NGXctL8/lOInxzcu8OuTN7Q+J1DA7F us+w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=iP8dvQna; 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 a640c23a62f3a-a6ef675a5e9si152600666b.393.2024.06.08.16.11.45; Sat, 08 Jun 2024 16:11:46 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=iP8dvQna; 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 DB36568D72D; Sun, 9 Jun 2024 02:11:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 47BC968D72C for ; Sun, 9 Jun 2024 02:10:53 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 998A240002 for ; Sat, 8 Jun 2024 23:10:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1717888252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aIDXdp1IiCpT2s6PcJManNg7FRrTtXXFGS9NP3QoxuI=; b=iP8dvQna0DBPmKslKjc2k3S+doVQtUmJlmokuXkxSKP7N1tfMMoF8Xx+2p4XbLg6hZJb+g ERW/YutyFPZjnJyy80z4XWFWkURKMdDpWOMdraBKPn4TLPaHScXGi0PMU+XFDlj7WSp0Li MQOdwMLZCuHs+6OG1hKOAovxtdfi2BRmr3LS9KlQlBZQbmOMTKayg2ODWiOXIjQxPj7m3R 4w3ICKxmRxZXNoD8FDvjlBuX6H6zysFFd5utkMDh4hA0at/ZOHfG0lKPkKvzVROYYbSSeh ammCmcNjVR2ONJ+aspG7qI8ZCHR7WTve1TEPkttKjvmLNPIqKnZT7czzr09PQg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 9 Jun 2024 01:10:43 +0200 Message-ID: <20240608231046.3619551-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240608231046.3619551-1-michael@niedermayer.cc> References: <20240608231046.3619551-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 6/9] avformat/subfile: Assert that whence is a known case 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ytfP5OivRbfv This may help CID1452449 Uninitialized scalar variable Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavformat/subfile.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/subfile.c b/libavformat/subfile.c index eedac1524e1..be48ef72ef2 100644 --- a/libavformat/subfile.c +++ b/libavformat/subfile.c @@ -18,6 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/opt.h" #include "url.h" @@ -135,6 +136,8 @@ static int64_t subfile_seek(URLContext *h, int64_t pos, int whence) case SEEK_END: new_pos = end + pos; break; + default: + av_assert0(0); } if (new_pos < c->start) return AVERROR(EINVAL); From patchwork Sat Jun 8 23:10:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49715 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1781880vqo; Sat, 8 Jun 2024 16:11:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX0NVJXrLfkbEl3AGn7QDFWZ+P6z48XoHacbbFqPdLGKcvnHzqxzXRsYrIj2cBb8nkMTZSMN4RMSFrxrlUi2fHEtIV9H1w7Itth4A== X-Google-Smtp-Source: AGHT+IGG6d5hOPHxcgxkzqOeOvFkkSxMMTI6Cnd/7iD+UmFnLWjxOPJSbMwF+jON5qmaDsQKefbP X-Received: by 2002:a17:906:fd86:b0:a6c:7027:b3e2 with SMTP id a640c23a62f3a-a6cca20ee78mr382076466b.0.1717888314560; Sat, 08 Jun 2024 16:11:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717888314; cv=none; d=google.com; s=arc-20160816; b=zd7yhQQ8pWxj430KdykjsKAcE6PJk9FhDiVYpuw5p/zdAHVIrNkRoJsrYcnFRxmDlg fmZyRwzFFKsHe4vQ3HsYeyyDQyOBrHx0xpIuRzXyOePcNqZKLqLeLFLmBpCPub+dCS9c xw4MUg00GyY+WzFENTO4huI6frNHYWrrh7EOQrlv5cFjnsU772MzkP/KHG5XiKhLGNMM jV8t8mzfdG5SyiKrjZ0cLWRGOv7y42l96h1PYVf3ZBEiwNTDogZs+UyEkERufnCuWXVr hi7HHZ0XyIEj+4sEDrDxnFO8rgvn4uIVFEvRa0c6HZpLIlRP1skxOWOrmN028sXnD2YK k+4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=RnFx42BtUZyI9v4+J0SFbddT6pVrjEh0uGc4g4eu0vU=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=Jtkj4axN4FI4HJwn+xrU4zvhW/sUQOG7kDSqWLt7o0vFHypd8QTwuEdUXlSeC9qlXR IkmruSPIuD+4cTb6fpB4BvVTigDBsqQe2seukqAGETRR3hewoez0h8pm6hTyMArI7rl3 zXGfnz2jWGeVgSUZR08ZonhCVgAiVgCj+0ysz4iFzjwAcPbSee2OfEmfCR/MwFqGdC1J WOyKIhJFByhDpDOmmdkQSHdw+8Wdfc6zmzMPVIO271qlTkJeeMEeKdcS/DZnGVpN9LF6 uw5J1htKnzMNd4rkgv60W+9ccTlZycWHOj+GhUmTX3zmrQeJC93fUCqUu3OgW1V+WMB2 2KsA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=YAMCIpz9; 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 a640c23a62f3a-a6c806dae3esi328828366b.439.2024.06.08.16.11.54; Sat, 08 Jun 2024 16:11:54 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=YAMCIpz9; 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 E4CFD68D749; Sun, 9 Jun 2024 02:11:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E434768D72F for ; Sun, 9 Jun 2024 02:10:53 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 5025C60002 for ; Sat, 8 Jun 2024 23:10:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1717888253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QdxlQnN7xwcWVdiIjjbQVpfNGXHGqC6p2u9cPGfE/FE=; b=YAMCIpz9SfHVGyNFEUfDi4Z2UnaJ8aNU88i8SqWr/aLSspwmxjE4vPEEyFgpBsyEwV6Sdb MAybkFIUxqtO1jFg6VYKAfkdAmKYDTF5JrsKQAM8z14RMhcIO9uQ4vmDoPqv21nCyuhXZT rVEw3zmyZR8Kskg6YEOW/W8rvpqplSyX+eSKzyX7vOZmubcj9OANpb0aggc6kqIjNTilXZ ZZnw8HRuAP7jFt1X0RgM9BvQG1rO6HuYfVW65RhZwQ4MNVxgGr0HlGDKgBtALu3tbwdv9V b97LII1FeL+jgDJEUcqlc/tyPsEqeR49Uan/Psp78b8bDMTz/9WdjToWOx6y8g== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 9 Jun 2024 01:10:44 +0200 Message-ID: <20240608231046.3619551-7-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240608231046.3619551-1-michael@niedermayer.cc> References: <20240608231046.3619551-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 7/9] avformat/tls_schannel: Initialize ret 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: F52/fLMlkzC2 Fixes: CID1591881 Uninitialized scalar variable Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavformat/tls_schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/tls_schannel.c b/libavformat/tls_schannel.c index 214a47a218b..55a6766fb2e 100644 --- a/libavformat/tls_schannel.c +++ b/libavformat/tls_schannel.c @@ -389,7 +389,7 @@ static int tls_read(URLContext *h, uint8_t *buf, int len) SECURITY_STATUS sspi_ret = SEC_E_OK; SecBuffer inbuf[4]; SecBufferDesc inbuf_desc; - int size, ret; + int size, ret = 0; int min_enc_buf_size = len + SCHANNEL_FREE_BUFFER_SIZE; /* If we have some left-over data from previous network activity, From patchwork Sat Jun 8 23:10:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49716 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1781912vqo; Sat, 8 Jun 2024 16:12:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVQnNe0vH/UGQaR1xzxeu5/hqFO0u1t54kYe04ucazYjZlhWk1TKiIKAesKsd/Qd4e6RMmkuWqz4spJBRDi/WSktj9DH2P0P0RQrA== X-Google-Smtp-Source: AGHT+IF06KpfedEMGaszOxf1+wzEW1Hi+MvboBJb9USQz84UELR95SKglADXMZHyyp+CHCW7jk8M X-Received: by 2002:a05:651c:1a2a:b0:2eb:e266:f9ba with SMTP id 38308e7fff4ca-2ebe266fb74mr1500171fa.23.1717888323075; Sat, 08 Jun 2024 16:12:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717888323; cv=none; d=google.com; s=arc-20160816; b=CXKA9bvDHrpKHUXWsHpYB5CnROA91jNACzjldM8MWLP2C7SKSYU3H57AJF/RNnyDbL xbaHvwKGLjNG0RvbNRvauJVphQwKMO67q7Bw1BRsVAKeHO8SGERABt5MX580MUBUW1ZV o4rTdZ/tpiJRWwbfMrp0BttoJzUltLHd/NrwjYYdweZP+cAA2XgtEZ4m9mZQUAXOK/86 zKrXAtZAad5i4rLPbAq5ufknQvk+Zw1fNmzRvrpRCW+31U7c8/B0uLF6vVXlS5dN0kXQ toA9OxB8BKcEc9KjS2opWaalMkrkULlMGsBfXVaSAjnoqTvHemyMmGOvpi85w6+Xb3mO wYOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=trPD6TfizdJabfp2uE5/zw56mXzdQLoHGZBPwN2q/Qc=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=uzPqnW+RbNwLIYMiHDFhNrdwOjEWAKG8JMGlmoA5up2+pfsMyjTQF+p2SzH9EDZbdx sHE8Twq56BMgURh2DzNry2v/yn3Sxi7WR0Ll61Ng6ZEklguk+Ly9zIlc6x6pv/N0hfT1 xmdS0n66e6svpICD6E7rWV2Q2nZdmjU7Pmr6sRzQaiJeyg3HymZ31Nxjbfdm6pzI9Nzk Xwf7FTJXOk+dHbTQm39F0ud73sCHb8BoF/7zgXUO7d46Mu/E7oFP2PYYiKlOjvj+IrlA fAazJYGottdtmnXy2a6NtLNfy/rHdXw1fUgsVqLZwyN8Mntyig/F9VDwJq8dTD5Ghcxv uDtA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=gowzPZMm; 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 a640c23a62f3a-a6c8074a7casi331297566b.956.2024.06.08.16.12.02; Sat, 08 Jun 2024 16:12:03 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=gowzPZMm; 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 289CE68D75A; Sun, 9 Jun 2024 02:11:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9A3A668D736 for ; Sun, 9 Jun 2024 02:10:54 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 07818C0002 for ; Sat, 8 Jun 2024 23:10:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1717888254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7d/pa86zWj8Vok8pTpylGijE87xmWBUm/KzaazdEhn4=; b=gowzPZMmNguMGeOn9VLik8VWPML1xPHEkqYcRIgBFwcMsKkyvojNP/bk6usGZB9HBdHtLT tvatRxRkdo55kefvrd+Jf0+RE6wSPe6yPtYEVuikzLaJdFh/S6xI/WGqZQPsHfXWdv05Bc 02ewgEW3g75J/K+6UobfbMuWTpE/ffyKkfswIJ1PuFZlBeMWCyK3xq/jZinFyt7Lp/IOLv PZEp3Z40KVwoDxV6EnSVAyVR9I2fhJlWxw2FZphgL74rL566uT2/4gih9mbVxaoSx9/VL6 +Ov43cq/n1DQWu4YJOAE7C3SkM7nkacRYI9eRUmpF5Txph2bIf0jzRIGeasBLQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 9 Jun 2024 01:10:45 +0200 Message-ID: <20240608231046.3619551-8-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240608231046.3619551-1-michael@niedermayer.cc> References: <20240608231046.3619551-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 8/9] avformat/udp: Fix temporary buffer race 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: a36oZQncb3qv Fixes: CID1551679 Data race condition Fixes: CID1551687 Data race condition Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavformat/udp.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavformat/udp.c b/libavformat/udp.c index c1ebdd12220..fd4847eda71 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -107,7 +107,8 @@ typedef struct UDPContext { pthread_cond_t cond; int thread_started; #endif - uint8_t tmp[UDP_MAX_PKT_SIZE+4]; + uint8_t tmp_rx[UDP_MAX_PKT_SIZE+4]; + uint8_t tmp_tx[UDP_MAX_PKT_SIZE+4]; int remaining_in_dg; char *localaddr; int timeout; @@ -504,7 +505,7 @@ static void *circular_buffer_task_rx( void *_URLContext) see "General Information" / "Thread Cancelation Overview" in Single Unix. */ pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old_cancelstate); - len = recvfrom(s->udp_fd, s->tmp+4, sizeof(s->tmp)-4, 0, (struct sockaddr *)&addr, &addr_len); + len = recvfrom(s->udp_fd, s->tmp_rx+4, sizeof(s->tmp_rx)-4, 0, (struct sockaddr *)&addr, &addr_len); pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancelstate); pthread_mutex_lock(&s->mutex); if (len < 0) { @@ -516,7 +517,7 @@ static void *circular_buffer_task_rx( void *_URLContext) } if (ff_ip_check_source_lists(&addr, &s->filters)) continue; - AV_WL32(s->tmp, len); + AV_WL32(s->tmp_rx, len); if (av_fifo_can_write(s->fifo) < len + 4) { /* No Space left */ @@ -532,7 +533,7 @@ static void *circular_buffer_task_rx( void *_URLContext) goto end; } } - av_fifo_write(s->fifo, s->tmp, len + 4); + av_fifo_write(s->fifo, s->tmp_rx, len + 4); pthread_cond_signal(&s->cond); } @@ -581,9 +582,9 @@ static void *circular_buffer_task_tx( void *_URLContext) len = AV_RL32(tmp); av_assert0(len >= 0); - av_assert0(len <= sizeof(s->tmp)); + av_assert0(len <= sizeof(s->tmp_tx)); - av_fifo_read(s->fifo, s->tmp, len); + av_fifo_read(s->fifo, s->tmp_tx, len); pthread_mutex_unlock(&s->mutex); @@ -607,7 +608,7 @@ static void *circular_buffer_task_tx( void *_URLContext) target_timestamp = start_timestamp + sent_bits * 1000000 / s->bitrate; } - p = s->tmp; + p = s->tmp_tx; while (len) { int ret; av_assert0(len > 0); From patchwork Sat Jun 8 23:10:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49717 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1781957vqo; Sat, 8 Jun 2024 16:12:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVNziivalLoLFwUsof1SJCd9aJbzIAAm5pO7rffKVjrliATojtmG7niCuwgzlfrEJRnSPn1DwjBXuijtHTxzkY1F1+J1J30O3DGsg== X-Google-Smtp-Source: AGHT+IGfmbMpSrRLJnPLQ7vVAWO+GT/gj25hHo3qwhuwfoSWU8UvOK+Ji2VoclDHxrX4/jPFTSnY X-Received: by 2002:a17:906:57d6:b0:a6e:f8bc:6f97 with SMTP id a640c23a62f3a-a6ef8bc7623mr204551666b.4.1717888332616; Sat, 08 Jun 2024 16:12:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717888332; cv=none; d=google.com; s=arc-20160816; b=Qc0nbNFlDYv86VyYSNJpUItFRlxQ2jowCa+ir/7Rr72FTFDmY/YRc7mf1GbT7WKDTt pFhk1DSbacpW5zqOD7Z2gQXXI9p238gdJ/Ta0lplYGggc25sFI7F8KbJQxxP5bbokb8u eeRnXlR5PlW/nZymW6zADLcRPrK9s4cts4FgXn9rJqVTzSKBzCikO62laj146Dewckol XNGuJm9yJM9U0MGHeYhrW94rKw3peQ8Aoom5OruO1HyUgwmXu+q/JpDtd/JA3VYmg1xv g1ers2DjUjliVUPYU1Ez6RDrgMfO9ehbii/qrPwcC6L/236pvNEO0B/RuXER+B5eqFtl 2U+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=MxxSWG48gPHlENNcuw/FG02UuEupIb3fFmWqXHtFeCA=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=tyf1Pz2W1kvxtVy/SPrVBcI0CB+btDO9qxvB1RHvdK+a/rFz64LgqLM/dNhcrfqNKS NxjTxDYOH6xycimVuBK1weKy35qRw/3zPA6ybncbIwyzqFZH2XFMlWXVCqYnivLqA4vC BhBBQZfhw+nk43D5U8mg1wg6o+5ZVHXkFfIZHkSFlaMRpfUfvJ3/W1k9YQC3QYpvR5u3 1EXu2RojVAfExJax9n5PaZ0CbV21eD6EaAxC+57aXrpLGj4kf5UNpUt5noOLAHlajQ54 ifk6mIGKtgTC4EtVBU8r5dv5shlzqKVNN/5zyd/EQ1TBmZGaKRjwJsGUdTOYttjf6zHl Qr8g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="F558Bt/Q"; 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 a640c23a62f3a-a6f105e764dsi52516366b.779.2024.06.08.16.12.11; Sat, 08 Jun 2024 16:12:12 -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; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="F558Bt/Q"; 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 31A1868D763; Sun, 9 Jun 2024 02:11:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 936EA68D747 for ; Sun, 9 Jun 2024 02:10:55 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id E056D1C0002 for ; Sat, 8 Jun 2024 23:10:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1717888255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dBcIjCEoTqiapHLbv/YhTCL+Sj1DSKrDs9Y5Fvhg0v4=; b=F558Bt/QuRXEl5WJaEuoaJCcZHwEmPUKFGPJpLSBy2r24sA/6w52IUGBgv4zNrSe91Xlvu LPYQt80F1CaGaDRtm59ihnd3CvYbzaSHXyMAXLKDUzk1EZq1dJQCAn1A5FIBsGPr+B+2xS Kste76bM724SpovUkLTG68Ci4EdAZxtrVKK/LoHjDeyyV1r1pCp4kOKKTSTsfENgI7oKex Aa4XdgC15fX1wpoLVe2CWHgJ9wQ6UrtTCcu4f4aAVlWUFXFKjQe7kXNFeHwBBcwhhnGDu1 fCMM6BCH13NFhaF2CtbmXPyJ+XghNQ0mwu7M/SwGu6fUz42bdYw2c7rTSlU/bA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 9 Jun 2024 01:10:46 +0200 Message-ID: <20240608231046.3619551-9-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240608231046.3619551-1-michael@niedermayer.cc> References: <20240608231046.3619551-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 9/9] avformat/usmdec: Initialize value 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WW9bD7n0uMGN Fixes: CID1551685 Uninitialized scalar variable Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavformat/usmdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/usmdec.c b/libavformat/usmdec.c index 9a21cc30413..6de2a73edf0 100644 --- a/libavformat/usmdec.c +++ b/libavformat/usmdec.c @@ -120,7 +120,7 @@ static int parse_utf(AVFormatContext *s, AVIOContext *pb, for (int i = 0; i < nb_items; i++) { GetByteContext *xgb; uint8_t key[256]; - int64_t value; + int64_t value = -1; int n = 0; type = bytestream2_get_byte(&gb);