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 7F29849E65 for ; Tue, 13 Aug 2024 14:05:34 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4D62C68DADA; Tue, 13 Aug 2024 17:05:33 +0300 (EEST) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 69E5668DA4A for ; Tue, 13 Aug 2024 17:05:26 +0300 (EEST) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1fc692abba4so46641305ad.2 for ; Tue, 13 Aug 2024 07:05:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723557924; x=1724162724; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=DQb/LXQ1b2/O6TT+KQJ7f2xBk+THgEucJBmxq2xJPY8=; b=ibLQJIvMP3eo36dH6PKX0vAQe4n6c5N4ATMchdaXkwMbBfizwxjt/BOv2bs9ubA52/ vIPLUq+fX7i5iRRaJwSrOK1s9oj75uz5LcjdnoEwCFXNE7Ptob1Sw+BDh5fEjzknGZ+9 YcC0ISMboYsLKxfucWSSoRC6htEGTf6Chf/+AugSvFL3e1nZKsWWEqmmLT+7RP0n2oAq taXE7diYOPgpvgssVEBef2pGQBnHVjUSHd+8usAP6AMjFa7WcfpQUKfXbzpOHwgLGcl1 S8TQV2+GVNULZYoQiaABXJ0yx8YztKCO4gc8YNoLXpSOS/TLKMR24QwcWnC+RG2jbXml P4LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723557924; x=1724162724; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=DQb/LXQ1b2/O6TT+KQJ7f2xBk+THgEucJBmxq2xJPY8=; b=YWNGagRZ226BdViUJa1jlFNTdN7Z4QoKoGub5PGOy6Lk4T1lW57MFAWhBT8SnFJR6Z mxy15+qDc7jDovxKgTvk7J9qjzPDkf10IW6hM/ajBeDgpYXJmZE8z2kmljRier9flpTI uwa4bg2ncjgvhsA9tU7Uw065KdhhLujlYnZhlCRpvDCGdXrlrRpv1gady+T3S8suyxP1 91hNR1PK5HgaZeCXUz7I46f7vAzQs8+7yfBuALWwqdHCYwwwzgiP+bSgkTlWo0Ex8+ft 9/3ik1ckZqJ+lf7jV/hZ2Klj7v9l3TdKiaqm1UuxyUCqyQCuxTB/kx3vwo2l8INTWuI0 GjyQ== X-Gm-Message-State: AOJu0YwRlBCC+rUZNU1gfvsYnlwcdqpCEO+v6dHd5zTVsjL6/sx16csO AxVpW3+kTA7FqKP5Zm5auUJ/aN8Y+NsWjoIptr06yc/IbSkZNpQJr3cbAw== X-Google-Smtp-Source: AGHT+IGddQ1tgZrIMmhya6ZGc9tiViQrSDeazSdj/iFq3ZtqGW53sYqH/5bypRhbZ0r6d0O8dnnxTQ== X-Received: by 2002:a17:902:d50c:b0:1ff:50b0:f5e2 with SMTP id d9443c01a7336-201ca12b242mr44001935ad.13.1723557924116; Tue, 13 Aug 2024 07:05:24 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-201cd1bcadbsm13850195ad.221.2024.08.13.07.05.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 07:05:23 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Aug 2024 11:05:29 -0300 Message-ID: <20240813140529.2204-1-jamrial@gmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Subject: [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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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; } -- 2.46.0 _______________________________________________ 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".