morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12150 from akallabeth/wlog-printf

Browse Source 
Wlog printf format string checks
This commit is contained in:
akallabeth
2026-01-16 13:01:55 +01:00
committed by GitHub
parent bcfb09b934 7d8c61931b
commit 90f62bd353
101 changed files with 548 additions and 705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libfreerdp/codec/clear.c
View File

@@ -259,8 +259,7 @@ static BOOL clear_decompress_subcode_rlex(wStream* WINPR_RESTRICT s, UINT32 bitm
if ((pixelIndex + runLengthFactor) > pixelCount)
{
WLog_ERR(TAG,
"pixelIndex %" PRIu32 " + runLengthFactor %" PRIu32 " > pixelCount %" PRIu32
"",
"pixelIndex %" PRIuz " + runLengthFactor %" PRIu32 " > pixelCount %" PRIu32 "",
pixelIndex, runLengthFactor, pixelCount);
return FALSE;
}
@@ -285,7 +284,7 @@ static BOOL clear_decompress_subcode_rlex(wStream* WINPR_RESTRICT s, UINT32 bitm
if ((pixelIndex + (suiteDepth + 1)) > pixelCount)
{
WLog_ERR(TAG,
"pixelIndex %" PRIu32 " + suiteDepth %" PRIu8 " + 1 > pixelCount %" PRIu32 "",
"pixelIndex %" PRIuz " + suiteDepth %" PRIu8 " + 1 > pixelCount %" PRIu32 "",
pixelIndex, suiteDepth, pixelCount);
return FALSE;
}
@@ -319,7 +318,7 @@ static BOOL clear_decompress_subcode_rlex(wStream* WINPR_RESTRICT s, UINT32 bitm
if (pixelIndex != pixelCount)
{
WLog_ERR(TAG, "pixelIndex %" PRIdz " != pixelCount %" PRIu32 "", pixelIndex, pixelCount);
WLog_ERR(TAG, "pixelIndex %" PRIuz " != pixelCount %" PRIu32 "", pixelIndex, pixelCount);
return FALSE;
}
@@ -342,7 +341,7 @@ static BOOL clear_resize_buffer(CLEAR_CONTEXT* WINPR_RESTRICT clear, UINT32 widt
if (!tmp)
{
WLog_ERR(TAG, "clear->TempBuffer winpr_aligned_recalloc failed for %" PRIu32 " bytes",
WLog_ERR(TAG, "clear->TempBuffer winpr_aligned_recalloc failed for %" PRIu64 " bytes",
size);
return FALSE;
}
@@ -711,7 +710,7 @@ static BOOL clear_decompress_bands_data(CLEAR_CONTEXT* WINPR_RESTRICT clear,
{
WLog_ERR(TAG,
"clear->ShortVBarStorageCursor %" PRIu32
" >= CLEARCODEC_VBAR_SHORT_SIZE (%" PRIu32 ")",
" >= CLEARCODEC_VBAR_SHORT_SIZE (%" PRId32 ")",
clear->ShortVBarStorageCursor, CLEARCODEC_VBAR_SHORT_SIZE);
return FALSE;
}
@@ -773,7 +772,7 @@ static BOOL clear_decompress_bands_data(CLEAR_CONTEXT* WINPR_RESTRICT clear,
if (clear->VBarStorageCursor >= CLEARCODEC_VBAR_SIZE)
{
WLog_ERR(TAG,
"clear->VBarStorageCursor %" PRIu32 " >= CLEARCODEC_VBAR_SIZE %" PRIu32
"clear->VBarStorageCursor %" PRIu32 " >= CLEARCODEC_VBAR_SIZE %" PRId32
"",
clear->VBarStorageCursor, CLEARCODEC_VBAR_SIZE);
return FALSE;

13
libfreerdp/codec/include/bitmap.h
View File

@@ -37,7 +37,7 @@ static inline BYTE* WRITEFGBGIMAGE(BYTE* WINPR_RESTRICT pbDest,
if (cBits > 8)
{
WLog_ERR(TAG, "cBits %d > 8", cBits);
WLog_ERR(TAG, "cBits %" PRIu32 " > 8", cBits);
return NULL;
}
@@ -71,7 +71,7 @@ static inline BYTE* WRITEFIRSTLINEFGBGIMAGE(BYTE* WINPR_RESTRICT pbDest,
if (cBits > 8)
{
WLog_ERR(TAG, "cBits %d > 8", cBits);
WLog_ERR(TAG, "cBits %" PRIu32 " > 8", cBits);
return NULL;
}
@@ -122,8 +122,9 @@ static inline BOOL RLEDECOMPRESS(const BYTE* WINPR_RESTRICT pbSrcBuffer, UINT32
if (!pbSrcBuffer || !pbDestBuffer)
{
WLog_ERR(TAG, "Invalid arguments: pbSrcBuffer=%p, pbDestBuffer=%p", pbSrcBuffer,
pbDestBuffer);
WLog_ERR(TAG, "Invalid arguments: pbSrcBuffer=%p, pbDestBuffer=%p",
WINPR_CXX_COMPAT_CAST(const void*, pbSrcBuffer),
WINPR_CXX_COMPAT_CAST(const void*, pbDestBuffer));
return FALSE;
}
@@ -442,7 +443,9 @@ static inline BOOL RLEDECOMPRESS(const BYTE* WINPR_RESTRICT pbSrcBuffer, UINT32
default:
WLog_ERR(TAG, "invalid code 0x%08" PRIx32 ", pbSrcBuffer=%p, pbSrc=%p, pbEnd=%p",
code, pbSrcBuffer, pbSrc, pbEnd);
code, WINPR_CXX_COMPAT_CAST(const void*, pbSrcBuffer),
WINPR_CXX_COMPAT_CAST(const void*, pbSrc),
WINPR_CXX_COMPAT_CAST(const void*, pbEnd));
return FALSE;
}
}

12
libfreerdp/codec/interleaved.c
View File

@@ -387,7 +387,8 @@ static inline BOOL ensure_capacity_(const BYTE* start, const BYTE* end, size_t s
WLog_ERR(TAG,
"[%s:%" PRIuz "] failed: start=%p <= end=%p, available=%" PRIuz " >= size=%" PRIuz
" * base=%" PRIuz,
fkt, line, start, end, available, size, base);
fkt, line, WINPR_CXX_COMPAT_CAST(const void*, start),
WINPR_CXX_COMPAT_CAST(const void*, end), available, size, base);
return res;
}
@@ -540,8 +541,10 @@ BOOL interleaved_decompress(BITMAP_INTERLEAVED_CONTEXT* WINPR_RESTRICT interleav
if (!interleaved || !pSrcData || !pDstData)
{
WLog_ERR(TAG, "invalid arguments: interleaved=%p, pSrcData=%p, pDstData=%p", interleaved,
pSrcData, pDstData);
WLog_ERR(TAG, "invalid arguments: interleaved=%p, pSrcData=%p, pDstData=%p",
WINPR_CXX_COMPAT_CAST(const void*, interleaved),
WINPR_CXX_COMPAT_CAST(const void*, pSrcData),
WINPR_CXX_COMPAT_CAST(const void*, pDstData));
return FALSE;
}
@@ -583,7 +586,8 @@ BOOL interleaved_decompress(BITMAP_INTERLEAVED_CONTEXT* WINPR_RESTRICT interleav
if (!interleaved->TempBuffer)
{
WLog_ERR(TAG, "interleaved->TempBuffer=%p", interleaved->TempBuffer);
WLog_ERR(TAG, "interleaved->TempBuffer=%p",
WINPR_CXX_COMPAT_CAST(const void*, interleaved->TempBuffer));
return FALSE;
}

14
libfreerdp/codec/planar.c
View File

@@ -226,7 +226,7 @@ static inline INT32 planar_skip_plane_rle(const BYTE* WINPR_RESTRICT pSrcData, U
if (used > SrcSize)
{
WLog_ERR(TAG, "planar plane used %" PRIu32 " exceeds SrcSize %" PRIu32, used,
WLog_ERR(TAG, "planar plane used %" PRIu32 " exceeds SrcSize %" PRId32, used,
INT32_MAX);
return -1;
}
@@ -835,8 +835,9 @@ BOOL freerdp_bitmap_decompress_planar(BITMAP_PLANAR_CONTEXT* WINPR_RESTRICT plan
if ((planes[2] + rawSizes[2]) > &pSrcData[SrcSize])
{
WLog_ERR(TAG, "plane size mismatch %p + %" PRIu32 " > %p", planes[2], rawSizes[2],
&pSrcData[SrcSize]);
WLog_ERR(TAG, "plane size mismatch %p + %" PRIu32 " > %p",
WINPR_CXX_COMPAT_CAST(const void*, planes[2]), rawSizes[2],
WINPR_CXX_COMPAT_CAST(const void*, &pSrcData[SrcSize]));
return FALSE;
}
}
@@ -844,7 +845,7 @@ BOOL freerdp_bitmap_decompress_planar(BITMAP_PLANAR_CONTEXT* WINPR_RESTRICT plan
{
if ((SrcSize - diff) < base)
{
WLog_ERR(TAG, "plane size mismatch %" PRIu32 " < %" PRIu32, SrcSize - diff, base);
WLog_ERR(TAG, "plane size mismatch %" PRIuz " < %" PRIu32, SrcSize - diff, base);
return FALSE;
}
@@ -854,8 +855,9 @@ BOOL freerdp_bitmap_decompress_planar(BITMAP_PLANAR_CONTEXT* WINPR_RESTRICT plan
if ((planes[2] + rawSizes[2]) > &pSrcData[SrcSize])
{
WLog_ERR(TAG, "plane size mismatch %p + %" PRIu32 " > %p", planes[2], rawSizes[2],
&pSrcData[SrcSize]);
WLog_ERR(TAG, "plane size mismatch %p + %" PRIu32 " > %p",
WINPR_CXX_COMPAT_CAST(const void*, planes[2]), rawSizes[2],
WINPR_CXX_COMPAT_CAST(const void*, &pSrcData[SrcSize]));
return FALSE;
}
}