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

codec/planar: Fix leak found by covscan

Browse Source 
The patch changes API of functions instead of fixing unused and broken code.

leaked_storage: Returning without freeing "outPlane" leaks the storage that it points to.
This commit is contained in:
Ondrej Holy
2018-08-21 09:16:47 +02:00
parent 36960e97a4
commit 79d0725a80
1 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libfreerdp/codec/planar.c
View File

@@ -33,7 +33,7 @@
#define TAG FREERDP_TAG("codec")
static INLINE BYTE* freerdp_bitmap_planar_compress_plane_rle(
static INLINE BOOL freerdp_bitmap_planar_compress_plane_rle(
const BYTE* plane, UINT32 width, UINT32 height,
BYTE* outPlane, UINT32* dstSize);
static INLINE BYTE* freerdp_bitmap_planar_delta_encode_plane(
@@ -948,7 +948,7 @@ static INLINE UINT32 freerdp_bitmap_planar_encode_rle_bytes(const BYTE* pInBuffe
return nTotalBytesWritten;
}
BYTE* freerdp_bitmap_planar_compress_plane_rle(const BYTE* inPlane,
BOOL freerdp_bitmap_planar_compress_plane_rle(const BYTE* inPlane,
UINT32 width, UINT32 height,
BYTE* outPlane, UINT32* dstSize)
{
@@ -960,25 +960,12 @@ BYTE* freerdp_bitmap_planar_compress_plane_rle(const BYTE* inPlane,
UINT32 nTotalBytesWritten;
if (!outPlane)
{
outBufferSize = width * height;
if (outBufferSize == 0)
return NULL;
outPlane = malloc(outBufferSize);
if (!outPlane)
return NULL;
}
else
{
outBufferSize = *dstSize;
}
return FALSE;
index = 0;
pInput = inPlane;
pOutput = outPlane;
outBufferSize = *dstSize;
nTotalBytesWritten = 0;
while (outBufferSize)
@@ -987,7 +974,7 @@ BYTE* freerdp_bitmap_planar_compress_plane_rle(const BYTE* inPlane,
pInput, width, pOutput, outBufferSize);
if ((!nBytesWritten) || (nBytesWritten > outBufferSize))
return NULL;
return FALSE;
outBufferSize -= nBytesWritten;
nTotalBytesWritten += nBytesWritten;
@@ -1000,7 +987,7 @@ BYTE* freerdp_bitmap_planar_compress_plane_rle(const BYTE* inPlane,
}
*dstSize = nTotalBytesWritten;
return outPlane;
return TRUE;
}
static INLINE BOOL freerdp_bitmap_planar_compress_planes_rle(