From patchwork Wed Sep 6 00:35:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 43574 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp2199543pzb; Tue, 5 Sep 2023 17:28:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGF+V0eyTMXT9+95o0MEwIY7/fhzH9G2xh3t2R3VkluX3WtQdczo9URrhyp6iDaUQ/4Yivz X-Received: by 2002:a05:6512:5c7:b0:4fe:ca9:d9bd with SMTP id o7-20020a05651205c700b004fe0ca9d9bdmr782530lfo.56.1693960095597; Tue, 05 Sep 2023 17:28:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693960095; cv=none; d=google.com; s=arc-20160816; b=j2+WsjKpl37kPksQu/pbjaMlP4bISIntxd5gsn72snRcFr3orIxGMPBJxRZJnppmlw rUeLyeM6Mx+/sGYVwiIHOi1SfkpMHk1vDaFUMFik9TZ+vmhKRO6OcQu2V/vXDm2AG08V LWlHAkoUu+DIUu9W+d8Qm8XmRQMjtbDTGx2PGNVE6RaPjToxxzolDg91Dr/Q0H+I+m4k 7W5KvIkBi6UsvcLjegZacZu6MKRc0iwfMqjBnstYBA55Y2l/8GDUes3Mz69KMyXZckBz 1kVOIADkp6xo4nMDNXgPSZNAeF0Cah9ttwhHWkCNIPJzxTjcotUfUyy/5Xrp8bdixDL7 +ryA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=/ritJyBdzHfH+jROySnluT14/CaGDXOKydtluD3SNlE=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=a1Ep/KFam6x3hy22aFWE98Q1URcBhYaVDIo4dd/aMuc/0vtKQztiwAkU9He8N8oTsj 95XBXol7bLy/aNuKAS7nme0f009p8KDbFSseQjV7l5zGqsGz87LFnkKc+VsAMldU6Xhy /op3kZdyerxY95oTbQvWW6C57m/s4fWcns4P+THBz/5+xDmKaI+TAR0rbtmCeQ/tfs8v x7RruOpwUeiibNcEJwuYWSEUAQOHTnypDDzM6gihp539fvguku9kjCxHoAz2JauSUgS0 LgrzscMCZBTgPo1LZ1eK62+usOuVvntq8EKgmNy/48SczRd3ypYSdI+/9brem58YdkGR ctkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=SsTrnwX5; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x14-20020a05640226ce00b0052c6c319701si155626edd.377.2023.09.05.17.28.14; Tue, 05 Sep 2023 17:28:15 -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=@gmail.com header.s=20221208 header.b=SsTrnwX5; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A601968C7CB; Wed, 6 Sep 2023 03:28:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f41.google.com (mail-vs1-f41.google.com [209.85.217.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 673C968C318 for ; Wed, 6 Sep 2023 03:28:04 +0300 (EEST) Received: by mail-vs1-f41.google.com with SMTP id ada2fe7eead31-44ebf4c623eso884366137.3 for ; Tue, 05 Sep 2023 17:28:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693960083; x=1694564883; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=8fw+TMpdJ+eihEKHp0ao47YXDpN+CWkVG1b7AUBnGNA=; b=SsTrnwX5EL3AWp/bjAYtKIB7wR1QKO04N5zltphonKy18kXTDGr3HzpzkniL1MehCj 50cDrw7hoFptI1qVE8N32/xlHKzeWPr/Csksmsw6TY9iYuFeIn8E+ey2os08Vk2JpAjR 2v8rUn5rhTUf5YJlRZi18bYxcpz52acKL1S28OF/0n0yoqEfar5b4LiPKSdZ/exRUBHd bmdkdR5MrsmSv/Z9hTThZ/1b0E0xHivWrSH77l0LQK7W8r0u82EFRESK2pSGKrfHWsB5 mCvxMHZCTkzMcOFWOAuBqspPKPN86Fm0TtNBXyT/oIyAOBUYnTfKEcclu1UtHBSTodul ANiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693960083; x=1694564883; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=8fw+TMpdJ+eihEKHp0ao47YXDpN+CWkVG1b7AUBnGNA=; b=Re2wsBmQP6Zram3e3H32p9fcysIR4ivQ1yccHXrBVuV9ZJDbjqgSnG4FUfz8vw3UNC HSxvUraqr9KmSUffgngziE04J7/owMnkvP6+09SN1T9Cz2/AuSaudh3+4zqu65Bw8+ue mAyf4VKtGVG3pu8jLPHiOLQXiZYUNqfugclKrEj1iN90IMhqCer845AM3z7Q69g69UmA K5hUhqZRcSD/lLuiaspAh99MvunWn9ZHMjvyq8Y5HWXX1c72rLdi0P1E9KT4Jbe4xczN gxnZIboqwGPYhXAHRmVsV56a96knFlaeYFVafxwXmO7d6AjJnTZM1OOovmMeoGRn+QXh wx2g== X-Gm-Message-State: AOJu0Yw1wk3HjOKQvQYEh4MJNLhb5tt5bacmW54Jme34+ba6nriJcnVa BZm6dWSxboHPXt9cs6zpf2JdggwD0V8SPOdDPCfq17R432g= X-Received: by 2002:a67:f041:0:b0:44e:9d4c:36de with SMTP id q1-20020a67f041000000b0044e9d4c36demr1303828vsm.33.1693960082972; Tue, 05 Sep 2023 17:28:02 -0700 (PDT) MIME-Version: 1.0 From: Paul B Mahol Date: Wed, 6 Sep 2023 02:35:23 +0200 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] avcodec/yuv4enc: do not read past end of input in case of odd height 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: uMeMxnHgqPcz Attached. From 8295be1415649255b26cfdb0308d7be208711b4d Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Wed, 6 Sep 2023 02:27:56 +0200 Subject: [PATCH] avcodec/yuv4enc: do not read past end of input in case of odd height Signed-off-by: Paul B Mahol --- libavcodec/yuv4enc.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libavcodec/yuv4enc.c b/libavcodec/yuv4enc.c index 8123260d5d..dd1874ff25 100644 --- a/libavcodec/yuv4enc.c +++ b/libavcodec/yuv4enc.c @@ -41,7 +41,7 @@ static int yuv4_encode_frame(AVCodecContext *avctx, AVPacket *pkt, u = pic->data[1]; v = pic->data[2]; - for (i = 0; i < avctx->height + 1 >> 1; i++) { + for (i = 0; i < avctx->height >> 1; i++) { for (j = 0; j < avctx->width + 1 >> 1; j++) { *dst++ = u[j] ^ 0x80; *dst++ = v[j] ^ 0x80; @@ -55,6 +55,17 @@ static int yuv4_encode_frame(AVCodecContext *avctx, AVPacket *pkt, v += pic->linesize[2]; } + if (avctx->height & 1) { + for (j = 0; j < avctx->width + 1 >> 1; j++) { + *dst++ = u[j] ^ 0x80; + *dst++ = v[j] ^ 0x80; + *dst++ = y[2 * j ]; + *dst++ = y[2 * j + 1]; + *dst++ = y[2 * j ]; + *dst++ = y[2 * j + 1]; + } + } + *got_packet = 1; return 0; } -- 2.39.1