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,nsc] bounds checks and doxygen

Browse Source 
* Improve doxygen for nsc_process_message
* Improve bounds checks for nsc_process_message
This commit is contained in:
Armin Novak
2026-02-15 19:32:38 +01:00
parent 0746639629
commit f4d74c33fd
2 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/freerdp/codec/nsc.h
View File

@@ -53,11 +53,33 @@ extern "C"
FREERDP_API BOOL nsc_context_set_parameters(NSC_CONTEXT* WINPR_RESTRICT context,
NSC_PARAMETER what, UINT32 value);
/** @brief decode a NSC message
*
* @param context The context to work on
* @param bpp The bit depth of the data
* @param width The width in pixels of the NSC surface
* @param height The height in pixels of the NSC surface
* @param data The data to decode
* @param length The length of \ref data in bytes
* @param pDstData The destination buffer. Must be at least \n nDstStride * nHeight in size.
* @param DstFormat The color format of the destination
* @param nDstStride The number of bytes per destination buffer line. Must be larger than
* bytes(DstFormat) * nWidth or \0 (in which case it is set to former minimum bound)
* @param nXDst The X offset in the destination buffer in pixels
* @param nYDst The Y offset in the destination buffer in pixels
* @param nWidth The width of the destination buffer in pixels
* @param nHeight The height of the destination buffer in pixels
* @param flip Image flipping flags FREERDP_FLIP_NONE et al passed on to \ref
* freerdp_image_copy
*
* @return \b TRUE in case of success, \b FALSE for any error. Check WLog for details.
*/
FREERDP_API BOOL nsc_process_message(NSC_CONTEXT* WINPR_RESTRICT context, UINT16 bpp,
UINT32 width, UINT32 height, const BYTE* data,
UINT32 length, BYTE* WINPR_RESTRICT pDstData,
UINT32 DstFormat, UINT32 nDstStride, UINT32 nXDst,
UINT32 nYDst, UINT32 nWidth, UINT32 nHeight, UINT32 flip);
FREERDP_API BOOL nsc_compose_message(NSC_CONTEXT* WINPR_RESTRICT context,
wStream* WINPR_RESTRICT s,
const BYTE* WINPR_RESTRICT bmpdata, UINT32 width,

12
libfreerdp/codec/nsc.c
View File

@@ -436,19 +436,25 @@ BOOL nsc_process_message(NSC_CONTEXT* WINPR_RESTRICT context, UINT16 bpp, UINT32
UINT32 nXDst, UINT32 nYDst, UINT32 nWidth,
WINPR_ATTR_UNUSED UINT32 nHeight, UINT32 flip)
{
wStream* s = NULL;
wStream sbuffer = { 0 };
BOOL ret = 0;
if (!context || !data || !pDstData)
return FALSE;
s = Stream_StaticConstInit(&sbuffer, data, length);
if (nXDst > nWidth)
return FALSE;
if (nYDst > nHeight)
return FALSE;
wStream* s = Stream_StaticConstInit(&sbuffer, data, length);
if (!s)
return FALSE;
const UINT32 minStride = nWidth * FreeRDPGetBytesPerPixel(DstFormat);
if (nDstStride == 0)
nDstStride = nWidth * FreeRDPGetBytesPerPixel(DstFormat);
nDstStride = minStride;
if (nDstStride < minStride)
return FALSE;
switch (bpp)
{