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 ESMTPS id AE31F4CAD6 for ; Thu, 13 Mar 2025 11:16:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A18B668E798; Thu, 13 Mar 2025 13:15:20 +0200 (EET) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 31D3F68E771 for ; Thu, 13 Mar 2025 13:15:12 +0200 (EET) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-43948f77f1aso5207375e9.0 for ; Thu, 13 Mar 2025 04:15:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741864511; x=1742469311; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OoG6FQY4WKfaM8lJ4/jBHtwYJsaMGQ+AkTlU68csbwc=; b=NPlSGhO1ogWvM64M0KHnMZsgevMXNsAuR3ij6laGFi6VNhEawq4GaqNAvmOgr2tonC 0InhIY6POpic7IJgxoR6Q9oqk1D+FQsqo6hOZj1UX/PkxU8n5X/1Z0LHWmbXQs4EM/gp 12EWfOPbxK0wQQf6/uvk0y/nw316hwTbzzbVybAseyV6mysGwKo2kM/FBqyr10zSmTFf HEtYiooPKQLhsrxYw+LNW9b0JVEJ1BZObXD76kSMHKl0SXAd1xL9GjPAynahIU9ucisC 3iOJHps4eChmXaEskRqUHWJKc6v0aDrtrR0HpdOvSWBfCoBx1k6BrIZH6fbu3vtV4xvE Tw4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741864511; x=1742469311; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OoG6FQY4WKfaM8lJ4/jBHtwYJsaMGQ+AkTlU68csbwc=; b=MqPdziG90SeHTqCBDrpvtok20M6L5A9njpDggTFKgbtrNkKU8L4YmhY51DQTIiCZ70 ZjRrNZ2JG5nnSd4egMqUbGt+KkrSwdi2jQl2E4UACDtfksANUjyMMniZKx9/pmajEVAJ hT0RlvT2o0US/1Tyc/VkXNExZhOzSYPq3v2md2yroLvB+P1kkSZy/m3/gr+pKQa76EqF SsuhicM/B7h4r4011F9hVj5oPm4Qs4jrh3N7Xg2J2DTdD4uM8URMisFaK/mTOS+1Kvjh vad6Z8YcCzAWmcF9nGyfVIJW2xYV8ymUDlTlYuqmiGYdg1DeolE+4SzvNXqVElCXe1Zn g6KA== X-Gm-Message-State: AOJu0Yzv1jJ0wIFuXjzZQEsdHrjJnoYuObo7CltI36YK0S2ZuRJzcBV6 o+Dz4dhGT7TjJgoDH+86ChLzlaDpkxqI26II9yIq6FoIzR3UOjLczboUEw== X-Gm-Gg: ASbGnctoO6At02SYTQ5iGS3nqHeDEsuuBzWBb1XjGijisByyCB7gXq2NuPmBqwcPCiq iApwjnZZcQwFLVENlZWjZr51glRZ/YYTrg9UNKUHgxyZYJfZnFJEDS2AsALsBDkNJJ0XLUvf5GY wYE/Qo7Q9dqUpJhLdSIoXVvkFxR00q8UHPsk++A2wfewptLekVkxgjHiyHthxTEbc8jpzUmp/L4 i5pkiv39t/zLLskxoYMTMQaWVkGcy9DL9kjU1Z03NdYsjrx98ICefBf5KHvOUQEi9QEI9ZKZ1RL +Y4Z8bQvOxkch2wWFwQI3W2ZtmN/hpKEKUZvkwC61UQxe+dU0g6IHpi3TI76cOUf53dbG9718Ro cYx4mIumcv5XdV9XWV4cb+BMdSm0x3WIEh5U5ivubKtsAmbPZte/KjZo= X-Google-Smtp-Source: AGHT+IH4qkRcdMn9tAT36Y+ad4MS7z1cjEgQdMOjEJreXaBsfaVqRdGUk4/FljAble7jVUTPII/AYw== X-Received: by 2002:a05:600c:1d09:b0:43c:efed:732b with SMTP id 5b1f17b1804b1-43cefed78bcmr162431255e9.5.1741864511299; Thu, 13 Mar 2025 04:15:11 -0700 (PDT) Received: from flagship3.deu.mlau.at (p200300c0271f29004c5623f045c27bca.dip0.t-ipconnect.de. [2003:c0:271f:2900:4c56:23f0:45c2:7bca]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d0a75b324sm50153795e9.24.2025.03.13.04.15.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 04:15:10 -0700 (PDT) From: Manuel Lauss To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Mar 2025 12:14:56 +0100 Message-ID: <20250313111505.166786-4-manuel.lauss@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250313111505.166786-1-manuel.lauss@gmail.com> References: <20250313111505.166786-1-manuel.lauss@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/12] avcodec/sanm: FOBJ left/top are signed values 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 Cc: Manuel Lauss 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: The left/top parameters of a FOBJ are signed values. Adjust codec1 code accordingly to not draw outside the buffer area. Rebel Assault 1 makes heavy use of this. Signed-off-by: Manuel Lauss --- libavcodec/sanm.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index 63956c01d6..9f656e6ba8 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -558,18 +558,18 @@ static int rle_decode(SANMVideoContext *ctx, uint8_t *dst, const int out_size) static int old_codec1(SANMVideoContext *ctx, int top, int left, int width, int height) { - uint8_t *dst = ((uint8_t *)ctx->frm0) + left + top * ctx->pitch; - int i, j, len, flag, code, val, pos, end; + int i, j, len, flag, code, val, end, pxoff; + const int maxpxo = ctx->height * ctx->pitch; + uint8_t *dst = (uint8_t *)ctx->frm0; for (i = 0; i < height; i++) { - pos = 0; - if (bytestream2_get_bytes_left(&ctx->gb) < 2) return AVERROR_INVALIDDATA; len = bytestream2_get_le16u(&ctx->gb); end = bytestream2_tell(&ctx->gb) + len; + pxoff = left + ((top + i) * ctx->pitch); while (bytestream2_tell(&ctx->gb) < end) { if (bytestream2_get_bytes_left(&ctx->gb) < 2) return AVERROR_INVALIDDATA; @@ -577,25 +577,28 @@ static int old_codec1(SANMVideoContext *ctx, int top, code = bytestream2_get_byteu(&ctx->gb); flag = code & 1; code = (code >> 1) + 1; - if (pos + code > width) - return AVERROR_INVALIDDATA; if (flag) { val = bytestream2_get_byteu(&ctx->gb); - if (val) - memset(dst + pos, val, code); - pos += code; + if (val) { + for (j = 0; j < code; j++) { + if (pxoff >= 0 && pxoff < maxpxo) + *(dst + pxoff) = val; + pxoff++; + } + } else { + pxoff += code; + } } else { if (bytestream2_get_bytes_left(&ctx->gb) < code) return AVERROR_INVALIDDATA; for (j = 0; j < code; j++) { val = bytestream2_get_byteu(&ctx->gb); - if (val) - dst[pos] = val; - pos++; + if ((pxoff >= 0) && (pxoff < maxpxo) && val) + *(dst + pxoff) = val; + pxoff++; } } } - dst += ctx->pitch; } ctx->rotate_code = 0; @@ -1236,8 +1239,8 @@ static int old_codec48(SANMVideoContext *ctx, int width, int height) static int process_frame_obj(SANMVideoContext *ctx) { uint16_t codec = bytestream2_get_le16u(&ctx->gb); - uint16_t left = bytestream2_get_le16u(&ctx->gb); - uint16_t top = bytestream2_get_le16u(&ctx->gb); + int16_t left = bytestream2_get_le16u(&ctx->gb); + int16_t top = bytestream2_get_le16u(&ctx->gb); uint16_t w = bytestream2_get_le16u(&ctx->gb); uint16_t h = bytestream2_get_le16u(&ctx->gb); -- 2.48.1 _______________________________________________ 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".