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

[codec,color] add freerdp_glyph_convert_ex

Browse Source 
The function freerdp_glyph_convert does not check input buffer length,
deprecate it and provide a replacement that does properly check.
This commit is contained in:
akallabeth
2026-01-16 12:00:15 +01:00
parent f96ee2a6dd
commit 3bc1eeb4f6
2 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/freerdp/codec/color.h
View File

@@ -288,6 +288,7 @@ typedef struct gdi_palette gdiPalette;
return (FreeRDPGetBitsPerPixel(format) + 7) / 8;
}
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
/***
*
* @param width width to copy in pixels
@@ -297,9 +298,27 @@ typedef struct gdi_palette gdiPalette;
* @return A buffer allocated with winpr_aligned_malloc(width * height, 16)
* if successful, NULL otherwise.
*/
WINPR_DEPRECATED_VAR("[since 3.21.0] use freerdp_glyph_convert_ex instead",
WINPR_ATTR_MALLOC(winpr_aligned_free, 1)
FREERDP_API BYTE* freerdp_glyph_convert(
UINT32 width, UINT32 height, const BYTE* WINPR_RESTRICT data));
#endif
/***
*
* @param width width to copy in pixels
* @param height height to copy in pixels
* @param data source buffer, must be (nWidth + 7) / 8 bytes long
* @param len the length of \ref data in bytes
*
* @return A buffer allocated with winpr_aligned_malloc(width * height, 16)
* if successful, NULL otherwise.
* @since version 3.21.0
*/
WINPR_ATTR_MALLOC(winpr_aligned_free, 1)
FREERDP_API BYTE* freerdp_glyph_convert(UINT32 width, UINT32 height,
const BYTE* WINPR_RESTRICT data);
FREERDP_API BYTE* freerdp_glyph_convert_ex(UINT32 width, UINT32 height,
const BYTE* WINPR_RESTRICT data, size_t len);
/***
*

21
libfreerdp/codec/color.c
View File

@@ -242,14 +242,33 @@ fail:
}
#endif
#if !defined(WITHOUT_FREERDP_3x_DEPRECATED)
BYTE* freerdp_glyph_convert(UINT32 width, UINT32 height, const BYTE* WINPR_RESTRICT data)
{
const size_t scanline = (width + 7ull) / 8ull;
const size_t required = scanline * height;
return freerdp_glyph_convert_ex(width, height, data, required);
}
#endif
BYTE* freerdp_glyph_convert_ex(UINT32 width, UINT32 height, const BYTE* WINPR_RESTRICT data,
size_t len)
{
/*
* converts a 1-bit-per-pixel glyph to a one-byte-per-pixel glyph:
* this approach uses a little more memory, but provides faster
* means of accessing individual pixels in blitting operations
*/
const UINT32 scanline = (width + 7) / 8;
const size_t scanline = (width + 7ull) / 8ull;
const size_t required = scanline * height;
if (len < required)
return NULL;
if ((len == 0) || (width == 0) || (height == 0))
return NULL;
WINPR_ASSERT(data);
BYTE* dstData = (BYTE*)winpr_aligned_malloc(1ull * width * height, 16);
if (!dstData)