From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id E79654CA95 for ; Tue, 13 Aug 2024 17:26:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2EF6068DA4E; Tue, 13 Aug 2024 20:26:06 +0300 (EEST) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BEA7268D963 for ; Tue, 13 Aug 2024 20:25:59 +0300 (EEST) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1fc587361b6so47355045ad.2 for ; Tue, 13 Aug 2024 10:25:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723569953; x=1724174753; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:content-language:references :to:from:subject:user-agent:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=Py1279N9W5+5uozb5ze0CYtQklRCg6uPV5YtbWNPnkY=; b=g/0axuhodLwBXLJKs4EufU+UFdeIePr6i0j3B+kNjYGOZzCsAgKdn7j7wkTM6/joAW M26EeLDbCIt7QPSOGw3FGF64TW3/ZaVb2qzTECUlZarmW7JIr6v6HEegZeTCDISp2mfs d7iSCPXpTggnMKMg0uCLF/Wc8NtJHRGEMdC2sM7N63gaKf7xU24bT8H823JBPh8UN2Cs OodCGu03cjlAHaUKR7LrbXkCHrm1tgshjEA8kF2fwyHmanvQEk/iAzR35L5MNyQF2ltU cZHHi4R9jd7/915gv1YZoL3Xt6FxWOnLri25b/NQiw6e91BDlcVVhpX2/LZ6kGeuQkld LTvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723569953; x=1724174753; h=content-transfer-encoding:in-reply-to:content-language:references :to:from:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Py1279N9W5+5uozb5ze0CYtQklRCg6uPV5YtbWNPnkY=; b=GYzfo2+0HUeaYG3PC+M471APiy1qrDBXZAnbcdhsO4LgQ5EKUCUMWaTwypUyJF83Jd VudbYC7KOXiYq2Qtyb6ONHb19eDm5dT5NpNhmM/K2JNy0t9LNLiGZLzJHOcqapg+HXKV NxLU2DMsvhV/B6ou3YvDDRxGWhT4rtgcYfaYPHOjQCPez2HRp2y4Ygx7s7iEYpNYUivx bWT/ObdkCGCS/82MdnV7kDonNMA/cbEu9Vc/7D1EwUDX2uM4LFuG32eCDQzagp/sdEkN mBzOhYDa0NIPJo2v8D1p3zpoViIM+CTHJumcoUe/CJGzxwN56pVYYH3kuMZs7IhESrxA s7jQ== X-Gm-Message-State: AOJu0Ywe8ALnUhnjq6JujMUSJYoBVcSk/tFx95CUKfQ9/dqze6X/NMF3 0ThGBtaAqrr4Iy0r3z/JixncpkP0t+uKE6mrf50pDFJ3NSWNjvGCkQI5dQ== X-Google-Smtp-Source: AGHT+IEVZKsf3rIrTMRGiio8Ypq+6xOHlNhYndVlvTzv0+VS3ccWi4c/UqSH9Dhs2MBB9ry2comfxA== X-Received: by 2002:a17:902:dac6:b0:1fc:6a13:a39c with SMTP id d9443c01a7336-201d639ca61mr3972275ad.1.1723569952307; Tue, 13 Aug 2024 10:25:52 -0700 (PDT) Received: from [192.168.0.14] ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-201cd1e285bsm16126875ad.303.2024.08.13.10.25.51 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 13 Aug 2024 10:25:51 -0700 (PDT) Message-ID: <669c3471-68d8-4423-9001-134c892c8e93@gmail.com> Date: Tue, 13 Aug 2024 14:26:09 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: James Almer To: ffmpeg-devel@ffmpeg.org References: <20240813140529.2204-1-jamrial@gmail.com> Content-Language: en-US In-Reply-To: <20240813140529.2204-1-jamrial@gmail.com> Subject: Re: [FFmpeg-devel] [PATCH] avcodec/rpzaenc: don't use buffer data beyond the end of a row 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 8/13/2024 11:05 AM, James Almer wrote: > Fixes use of uninitized data (masked by the default zeroing of image buffers). > > Signed-off-by: James Almer > --- > libavcodec/rpzaenc.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/rpzaenc.c b/libavcodec/rpzaenc.c > index d84555d6c6..3a1924d385 100644 > --- a/libavcodec/rpzaenc.c > +++ b/libavcodec/rpzaenc.c > @@ -749,20 +749,24 @@ post_skip : > > if (err > s->sixteen_color_thresh) { // DO SIXTEEN COLOR BLOCK > const uint16_t *row_ptr; > - int y_size, rgb555; > + int y_size, x_size, rgb555; > > block_offset = get_block_info(&bi, block_counter, 0); > pblock_offset = get_block_info(&bi, block_counter, 1); > > row_ptr = &src_pixels[block_offset]; > y_size = FFMIN(4, bi.image_height - bi.row * 4); > + x_size = FFMIN(4, bi.image_width - bi.col * 4); > > for (int y = 0; y < y_size; y++) { > - for (int x = 0; x < 4; x++) { > + for (int x = 0; x < x_size; x++) { > rgb555 = row_ptr[x] & ~0x8000; > > put_bits(&s->pb, 16, rgb555); > } > + for (int x = x_size; x < 4; x++) > + put_bits(&s->pb, 16, 0); > + > row_ptr += bi.rowstride; > } Will apply soon to remove all the yellow from fate. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".