Rmys
92 lines
4.4 KiB
Diff
92 lines
4.4 KiB
Diff
From d8dc2956e5df589ca0766d88797f1cd4dbb10882 Mon Sep 17 00:00:00 2001
|
|
From: akallabeth <akallabeth@posteo.net>
|
|
Date: Tue, 22 Oct 2024 11:02:11 +0200
|
|
Subject: [PATCH] [codec,color] fix overlapping check
|
|
|
|
only consider images that do not contain the same lines not overlapping.
|
|
Ignore any x offsets as this may lead to alignment problems resulting in
|
|
invalid overlapping areas.
|
|
---
|
|
libfreerdp/codec/color.c | 37 ++++++++++++++-----------------------
|
|
1 file changed, 14 insertions(+), 23 deletions(-)
|
|
|
|
diff --git a/libfreerdp/codec/color.c b/libfreerdp/codec/color.c
|
|
index 3d4060638c2d..dff567f60647 100644
|
|
--- a/libfreerdp/codec/color.c
|
|
+++ b/libfreerdp/codec/color.c
|
|
@@ -549,22 +549,20 @@ BOOL freerdp_image_copy_from_pointer_data(BYTE* WINPR_RESTRICT pDstData, UINT32
|
|
}
|
|
}
|
|
|
|
-static INLINE BOOL overlapping(const BYTE* pDstData, UINT32 nXDst, UINT32 nYDst, UINT32 nDstStep,
|
|
- UINT32 dstBytesPerPixel, const BYTE* pSrcData, UINT32 nXSrc,
|
|
- UINT32 nYSrc, UINT32 nSrcStep, UINT32 srcBytesPerPixel,
|
|
- UINT32 nWidth, UINT32 nHeight)
|
|
+static INLINE BOOL overlapping(const BYTE* pDstData, UINT32 nYDst, UINT32 nDstStep,
|
|
+ const BYTE* pSrcData, UINT32 nYSrc, UINT32 nSrcStep, UINT32 nHeight)
|
|
{
|
|
- const BYTE* pDstStart = &pDstData[1ULL * nXDst * dstBytesPerPixel + 1ULL * nYDst * nDstStep];
|
|
- const BYTE* pDstEnd = pDstStart + 1ULL * nHeight * nDstStep;
|
|
- const BYTE* pSrcStart = &pSrcData[1ULL * nXSrc * srcBytesPerPixel + 1ULL * nYSrc * nSrcStep];
|
|
- const BYTE* pSrcEnd = pSrcStart + 1ULL * nHeight * nSrcStep;
|
|
-
|
|
- WINPR_UNUSED(nWidth);
|
|
-
|
|
- if ((pDstStart >= pSrcStart) && (pDstStart <= pSrcEnd))
|
|
+ const uintptr_t src = (uintptr_t)pSrcData;
|
|
+ const uintptr_t srcstart = src + 1ULL * nSrcStep * nYSrc;
|
|
+ const uintptr_t srcend = srcstart + 1ULL * nSrcStep * nHeight;
|
|
+ const uintptr_t dst = (uintptr_t)pDstData;
|
|
+ const uintptr_t dststart = dst + 1ULL * nDstStep * nYDst;
|
|
+ const uintptr_t dstend = dststart + 1ULL * nDstStep * nHeight;
|
|
+
|
|
+ if ((dststart >= srcstart) && (dststart <= srcend))
|
|
return TRUE;
|
|
|
|
- if ((pDstEnd >= pSrcStart) && (pDstEnd <= pSrcEnd))
|
|
+ if ((dstend >= srcstart) && (dstend <= srcend))
|
|
return TRUE;
|
|
|
|
return FALSE;
|
|
@@ -733,8 +731,7 @@ BOOL freerdp_image_copy_overlap(BYTE* pDstData, DWORD DstFormat, UINT32 nDstStep
|
|
SSIZE_T dstVOffset = 0;
|
|
SSIZE_T dstVMultiplier = 1;
|
|
|
|
- WINPR_ASSERT(overlapping(pDstData, nXDst, nYDst, nDstStep, dstByte, pSrcData, nXSrc, nYSrc,
|
|
- nSrcStep, srcByte, nWidth, nHeight));
|
|
+ WINPR_ASSERT(overlapping(pDstData, nYDst, nDstStep, pSrcData, nYSrc, nSrcStep, nHeight));
|
|
|
|
if ((nWidth == 0) || (nHeight == 0))
|
|
return TRUE;
|
|
@@ -851,9 +848,6 @@ BOOL freerdp_image_copy(BYTE* pDstData, DWORD DstFormat, UINT32 nDstStep, UINT32
|
|
DWORD SrcFormat, UINT32 nSrcStep, UINT32 nXSrc, UINT32 nYSrc,
|
|
const gdiPalette* WINPR_RESTRICT palette, UINT32 flags)
|
|
{
|
|
- const UINT32 dstByte = FreeRDPGetBytesPerPixel(DstFormat);
|
|
- const UINT32 srcByte = FreeRDPGetBytesPerPixel(SrcFormat);
|
|
-
|
|
if ((nHeight > INT32_MAX) || (nWidth > INT32_MAX))
|
|
return FALSE;
|
|
|
|
@@ -869,8 +863,7 @@ BOOL freerdp_image_copy(BYTE* pDstData, DWORD DstFormat, UINT32 nDstStep, UINT32
|
|
if (nSrcStep == 0)
|
|
nSrcStep = nWidth * FreeRDPGetBytesPerPixel(SrcFormat);
|
|
|
|
- const BOOL ovl = overlapping(pDstData, nXDst, nYDst, nDstStep, dstByte, pSrcData, nXSrc, nYSrc,
|
|
- nSrcStep, srcByte, nWidth, nHeight);
|
|
+ const BOOL ovl = overlapping(pDstData, nYDst, nDstStep, pSrcData, nYSrc, nSrcStep, nHeight);
|
|
if (ovl)
|
|
return freerdp_image_copy_overlap(pDstData, DstFormat, nDstStep, nXDst, nYDst, nWidth,
|
|
nHeight, pSrcData, SrcFormat, nSrcStep, nXSrc, nYSrc,
|
|
@@ -1611,9 +1604,7 @@ BOOL freerdp_image_copy_no_overlap(BYTE* WINPR_RESTRICT pDstData, DWORD DstForma
|
|
if (!prims)
|
|
prims = primitives_get();
|
|
|
|
- WINPR_ASSERT(!overlapping(pDstData, nXDst, nYDst, nDstStep, FreeRDPGetBytesPerPixel(DstFormat),
|
|
- pSrcData, nXSrc, nYSrc, nSrcStep, FreeRDPGetBytesPerPixel(SrcFormat),
|
|
- nWidth, nHeight));
|
|
+ WINPR_ASSERT(!overlapping(pDstData, nYDst, nDstStep, pSrcData, nYSrc, nSrcStep, nHeight));
|
|
WINPR_ASSERT(prims);
|
|
WINPR_ASSERT(prims->copy_no_overlap);
|
|
return prims->copy_no_overlap(pDstData, DstFormat, nDstStep, nXDst, nYDst, nWidth, nHeight,
|