mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[clang-tidy] clang-analyzer-core.NullDereference

This commit is contained in:
akallabeth 2024-01-23 21:03:28 +01:00 committed by akallabeth
parent f69e1fe697
commit 81d2c1f057
18 changed files with 105 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channels/audin/server/audin.c
View File

@ -826,7 +826,7 @@ audin_server_context* audin_server_context_new(HANDLE vcm)
if (!audin) if (!audin)
{ {
WLog_Print(audin->log, WLOG_ERROR, "calloc failed!"); WLog_ERR(AUDIN_TAG, "calloc failed!");
return NULL; return NULL;
} }
audin->log = WLog_Get(AUDIN_TAG); audin->log = WLog_Get(AUDIN_TAG);

7
channels/rdpdr/client/rdpdr_main.c
View File

@ -68,6 +68,8 @@
#include "rdpdr_main.h" #include "rdpdr_main.h"
#define TAG CHANNELS_TAG("rdpdr.client")
/* IMPORTANT: Keep in sync with DRIVE_DEVICE */ /* IMPORTANT: Keep in sync with DRIVE_DEVICE */
typedef struct typedef struct
{ {
@ -2231,7 +2233,7 @@ static VOID VCAPITYPE rdpdr_virtual_channel_init_event_ex(LPVOID lpUserParam, LP
if (!rdpdr || (rdpdr->InitHandle != pInitHandle)) if (!rdpdr || (rdpdr->InitHandle != pInitHandle))
{ {
WLog_Print(rdpdr->log, WLOG_ERROR, "error no match"); WLog_ERR(TAG, "error no match");
return; return;
} }
@ -2277,7 +2279,6 @@ static VOID VCAPITYPE rdpdr_virtual_channel_init_event_ex(LPVOID lpUserParam, LP
} }
/* rdpdr is always built-in */ /* rdpdr is always built-in */
#define TAG CHANNELS_TAG("rdpdr.client")
#define VirtualChannelEntryEx rdpdr_VirtualChannelEntryEx #define VirtualChannelEntryEx rdpdr_VirtualChannelEntryEx
FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS pEntryPoints, FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS pEntryPoints,
@ -2294,7 +2295,7 @@ FREERDP_ENTRY_POINT(BOOL VCAPITYPE VirtualChannelEntryEx(PCHANNEL_ENTRY_POINTS p
if (!rdpdr) if (!rdpdr)
{ {
WLog_Print(rdpdr->log, WLOG_ERROR, "calloc failed!"); WLog_ERR(TAG, "calloc failed!");
return FALSE; return FALSE;
} }
rdpdr->log = WLog_Get(TAG); rdpdr->log = WLog_Get(TAG);

2
channels/rdpgfx/server/rdpgfx_main.c
View File

@ -1689,7 +1689,7 @@ RdpgfxServerContext* rdpgfx_server_context_new(HANDLE vcm)
if (!context) if (!context)
{ {
WLog_Print(context->priv->log, WLOG_ERROR, "calloc failed!"); WLog_ERR(TAG, "calloc failed!");
return NULL; return NULL;
} }

17
libfreerdp/cache/bitmap.c vendored
View File

@ -310,12 +310,15 @@ static int bitmap_cache_save_persistent(rdpBitmapCache* bitmapCache)
if (status < 1) if (status < 1)
goto end; goto end;
if (bitmapCache->cells)
{
for (UINT32 i = 0; i < bitmapCache->maxCells; i++) for (UINT32 i = 0; i < bitmapCache->maxCells; i++)
{ {
for (UINT32 j = 0; j < bitmapCache->cells[i].number + 1; j++) BITMAP_V2_CELL* cell = &bitmapCache->cells[i];
for (UINT32 j = 0; j < cell->number + 1 && cell->entries; j++)
{ {
PERSISTENT_CACHE_ENTRY cacheEntry; PERSISTENT_CACHE_ENTRY cacheEntry;
rdpBitmap* bitmap = bitmapCache->cells[i].entries[j]; rdpBitmap* bitmap = cell->entries[j];
if (!bitmap || !bitmap->key64) if (!bitmap || !bitmap->key64)
continue; continue;
@ -334,6 +337,7 @@ static int bitmap_cache_save_persistent(rdpBitmapCache* bitmapCache)
} }
} }
} }
}
status = 1; status = 1;
@ -397,8 +401,9 @@ void bitmap_cache_free(rdpBitmapCache* bitmapCache)
bitmap_cache_save_persistent(bitmapCache); bitmap_cache_save_persistent(bitmapCache);
UINT32 i = 0; if (bitmapCache->cells)
for (i = 0; i < bitmapCache->maxCells; i++) {
for (UINT32 i = 0; i < bitmapCache->maxCells; i++)
{ {
UINT32 j = 0; UINT32 j = 0;
BITMAP_V2_CELL* cell = &bitmapCache->cells[i]; BITMAP_V2_CELL* cell = &bitmapCache->cells[i];
@ -412,10 +417,12 @@ void bitmap_cache_free(rdpBitmapCache* bitmapCache)
Bitmap_Free(bitmapCache->context, bitmap); Bitmap_Free(bitmapCache->context, bitmap);
} }
free(bitmapCache->cells[i].entries); free(cell->entries);
} }
free(bitmapCache->cells); free(bitmapCache->cells);
}
persistent_cache_free(bitmapCache->persistent); persistent_cache_free(bitmapCache->persistent);
free(bitmapCache); free(bitmapCache);

7
libfreerdp/codec/progressive.c
View File

@ -1767,9 +1767,12 @@ static INLINE SSIZE_T progressive_process_tiles(PROGRESSIVE_CONTEXT* progressive
return -1044; return -1044;
} }
if (progressive->rfx_context->priv->UseThreads)
{ {
work_objects = (PTP_WORK*)winpr_aligned_calloc(region->numTiles, sizeof(PTP_WORK), 32); size_t tcount = 1;
if (progressive->rfx_context->priv->UseThreads)
tcount = region->numTiles;
work_objects = (PTP_WORK*)winpr_aligned_calloc(tcount, sizeof(PTP_WORK), 32);
if (!work_objects) if (!work_objects)
return -1; return -1;
} }

3
libfreerdp/core/rdp.c
View File

@ -260,7 +260,8 @@ BOOL rdp_read_share_control_header(rdpRdp* rdp, wStream* s, UINT16* tpktLength,
char buffer[128] = { 0 }; char buffer[128] = { 0 };
WLog_Print(rdp->log, WLOG_DEBUG, WLog_Print(rdp->log, WLOG_DEBUG,
"[Flow control PDU] type=%s, tpktLength=%" PRIuz ", remainingLength=%" PRIuz, "[Flow control PDU] type=%s, tpktLength=%" PRIuz ", remainingLength=%" PRIuz,
pdu_type_to_str(*type, buffer, sizeof(buffer)), *tpktLength, *remainingLength); pdu_type_to_str(*type, buffer, sizeof(buffer)), tpktLength ? *tpktLength : 0,
*remainingLength);
return TRUE; return TRUE;
} }

2
libfreerdp/core/test/TestSettings.c
View File

@ -17,6 +17,8 @@ static BOOL compare(const ADDIN_ARGV* got, const ADDIN_ARGV* expect)
{ {
int x = 0; int x = 0;
BOOL rc = TRUE; BOOL rc = TRUE;
if (!got && !expect)
return FALSE;
if (!got && expect) if (!got && expect)
return FALSE; return FALSE;
if (got && !expect) if (got && !expect)

3
libfreerdp/gdi/gdi.c
View File

@ -476,7 +476,8 @@ BOOL gdi_bitmap_update(rdpContext* context, const BITMAP_UPDATE* bitmapUpdate)
WLog_ERR(TAG, WLog_ERR(TAG,
"Invalid arguments: context=%p, bitmapUpdate=%p, context->gdi=%p, " "Invalid arguments: context=%p, bitmapUpdate=%p, context->gdi=%p, "
"context->codecs=%p", "context->codecs=%p",
context, bitmapUpdate, context->gdi, context->codecs); context, bitmapUpdate, context ? context->gdi : NULL,
context ? context->codecs : NULL);
return FALSE; return FALSE;
} }

1
libfreerdp/utils/smartcard_call.c
View File

@ -1923,6 +1923,7 @@ void smartcard_call_context_free(scard_call_context* ctx)
LinkedList_Free(ctx->names); LinkedList_Free(ctx->names);
if (ctx->StartedEvent) if (ctx->StartedEvent)
{ {
WINPR_ASSERT(ctx->useEmulatedCard || ctx->pWinSCardApi);
wrap(ctx, SCardReleaseStartedEvent); wrap(ctx, SCardReleaseStartedEvent);
} }

4
server/proxy/channels/pf_channel_rdpdr.c
View File

@ -1333,7 +1333,7 @@ BOOL pf_channel_rdpdr_client_handle(pClientContext* pc, UINT16 channelId, const
rdpdr = HashTable_GetItemValue(pc->interceptContextMap, channel_name); rdpdr = HashTable_GetItemValue(pc->interceptContextMap, channel_name);
if (!rdpdr) if (!rdpdr)
{ {
CLIENT_RX_LOG(rdpdr->log, WLOG_ERROR, CLIENT_RX_LOG(WLog_Get(RTAG), WLOG_ERROR,
"Channel %s [0x%04" PRIx16 "] missing context in interceptContextMap", "Channel %s [0x%04" PRIx16 "] missing context in interceptContextMap",
channel_name, channelId); channel_name, channelId);
return FALSE; return FALSE;
@ -1837,7 +1837,7 @@ static pf_channel_server_context* get_channel(pServerContext* ps, BOOL send)
rdpdr = HashTable_GetItemValue(ps->interceptContextMap, RDPDR_SVC_CHANNEL_NAME); rdpdr = HashTable_GetItemValue(ps->interceptContextMap, RDPDR_SVC_CHANNEL_NAME);
if (!rdpdr) if (!rdpdr)
{ {
SERVER_RXTX_LOG(send, rdpdr->log, WLOG_ERROR, SERVER_RXTX_LOG(send, WLog_Get(RTAG), WLOG_ERROR,
"Channel %s missing context in interceptContextMap", "Channel %s missing context in interceptContextMap",
RDPDR_SVC_CHANNEL_NAME); RDPDR_SVC_CHANNEL_NAME);
return NULL; return NULL;

1
server/shadow/shadow_server.c
View File

@ -707,6 +707,7 @@ int shadow_server_stop(rdpShadowServer* server)
WaitForSingleObject(server->thread, INFINITE); WaitForSingleObject(server->thread, INFINITE);
CloseHandle(server->thread); CloseHandle(server->thread);
server->thread = NULL; server->thread = NULL;
if (server->listener && server->listener->Close)
server->listener->Close(server->listener); server->listener->Close(server->listener);
} }

2
winpr/libwinpr/file/generic.c
View File

@ -1197,6 +1197,8 @@ BOOL FindNextFileW(HANDLE hFindFile, LPWIN32_FIND_DATAW lpFindFileData)
BOOL FindClose(HANDLE hFindFile) BOOL FindClose(HANDLE hFindFile)
{ {
WIN32_FILE_SEARCH* pFileSearch = (WIN32_FILE_SEARCH*)hFindFile; WIN32_FILE_SEARCH* pFileSearch = (WIN32_FILE_SEARCH*)hFindFile;
if (!pFileSearch)
return FALSE;
/* Since INVALID_HANDLE_VALUE != NULL the analyzer guesses that there /* Since INVALID_HANDLE_VALUE != NULL the analyzer guesses that there
* is a initialized HANDLE that is not freed properly. * is a initialized HANDLE that is not freed properly.

2
winpr/libwinpr/sspi/Kerberos/kerberos.c
View File

@ -975,6 +975,7 @@ static SECURITY_STATUS SEC_ENTRY kerberos_InitializeSecurityContextA(
context->state = KERBEROS_STATE_FINAL; context->state = KERBEROS_STATE_FINAL;
if (output_buffer)
output_buffer->cbBuffer = 0; output_buffer->cbBuffer = 0;
status = SEC_E_OK; status = SEC_E_OK;
@ -1224,6 +1225,7 @@ static SECURITY_STATUS SEC_ENTRY kerberos_AcceptSecurityContext(
} }
else else
{ {
if (output_buffer)
output_buffer->cbBuffer = 0; output_buffer->cbBuffer = 0;
} }

2
winpr/libwinpr/sspi/Kerberos/krb5glue_heimdal.c
View File

@ -189,7 +189,7 @@ krb5_error_code krb5glue_get_init_creds(krb5_context ctx, krb5_principal princ,
break; break;
if ((rv = krb5_init_creds_set_password(ctx, creds_ctx, password)) != 0) if ((rv = krb5_init_creds_set_password(ctx, creds_ctx, password)) != 0)
break; break;
if (krb_settings->armorCache) if (krb_settings && krb_settings->armorCache)
{ {
krb5_ccache armor_cc = NULL; krb5_ccache armor_cc = NULL;
if ((rv = krb5_cc_resolve(ctx, krb_settings->armorCache, &armor_cc)) != 0) if ((rv = krb5_cc_resolve(ctx, krb_settings->armorCache, &armor_cc)) != 0)

2
winpr/libwinpr/sspi/NTLM/ntlm.c
View File

@ -56,7 +56,7 @@ static BOOL check_context_(NTLM_CONTEXT* context, const char* file, const char*
WLog_PrintMessage(log, WLOG_MESSAGE_TEXT, log_level, line, file, fkt, WLog_PrintMessage(log, WLOG_MESSAGE_TEXT, log_level, line, file, fkt,
"invalid context"); "invalid context");
rc = FALSE; return FALSE;
} }
if (!context->RecvRc4Seal) if (!context->RecvRc4Seal)

8
winpr/libwinpr/sspi/Negotiate/negotiate.c
View File

@ -583,10 +583,12 @@ static SECURITY_STATUS negotiate_mic_exchange(NEGOTIATE_CONTEXT* context, NegTok
{ {
/* Store the mic token after the mech token in the output buffer */ /* Store the mic token after the mech token in the output buffer */
output_token->mic.BufferType = SECBUFFER_TOKEN; output_token->mic.BufferType = SECBUFFER_TOKEN;
if (output_buffer)
{
output_token->mic.cbBuffer = output_buffer->cbBuffer - output_token->mechToken.cbBuffer; output_token->mic.cbBuffer = output_buffer->cbBuffer - output_token->mechToken.cbBuffer;
output_token->mic.pvBuffer = output_token->mic.pvBuffer =
(BYTE*)output_buffer->pvBuffer + output_token->mechToken.cbBuffer; (BYTE*)output_buffer->pvBuffer + output_token->mechToken.cbBuffer;
}
mic_buffers[1] = output_token->mic; mic_buffers[1] = output_token->mic;
status = table->MakeSignature(&context->sub_context, 0, &mic_buffer_desc, 0); status = table->MakeSignature(&context->sub_context, 0, &mic_buffer_desc, 0);
@ -849,6 +851,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_InitializeSecurityContextW(
if (context->mic || input_token.negState != ACCEPT_COMPLETED) if (context->mic || input_token.negState != ACCEPT_COMPLETED)
return SEC_E_INVALID_TOKEN; return SEC_E_INVALID_TOKEN;
if (output_buffer)
output_buffer->cbBuffer = 0; output_buffer->cbBuffer = 0;
return SEC_E_OK; return SEC_E_OK;
} }
@ -864,6 +867,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_InitializeSecurityContextW(
if (input_token.negState == ACCEPT_COMPLETED) if (input_token.negState == ACCEPT_COMPLETED)
{ {
if (output_buffer)
output_buffer->cbBuffer = 0; output_buffer->cbBuffer = 0;
return SEC_E_OK; return SEC_E_OK;
} }
@ -1016,6 +1020,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_AcceptSecurityContext(
if (init_context.mech) if (init_context.mech)
{ {
if (output_buffer)
output_token.mechToken = *output_buffer; output_token.mechToken = *output_buffer;
WLog_DBG(TAG, "Requested mechanism: %s", WLog_DBG(TAG, "Requested mechanism: %s",
negotiate_mech_name(init_context.mech->oid)); negotiate_mech_name(init_context.mech->oid));
@ -1156,6 +1161,7 @@ static SECURITY_STATUS SEC_ENTRY negotiate_AcceptSecurityContext(
if (input_token.negState == ACCEPT_COMPLETED) if (input_token.negState == ACCEPT_COMPLETED)
{ {
if (output_buffer)
output_buffer->cbBuffer = 0; output_buffer->cbBuffer = 0;
return SEC_E_OK; return SEC_E_OK;
} }

1
winpr/libwinpr/utils/cmdline.c
View File

@ -796,6 +796,7 @@ fail:
free(copy); free(copy);
if (!success) if (!success)
{ {
if (count)
*count = 0; *count = 0;
free(p); free(p);
return NULL; return NULL;

22
winpr/libwinpr/utils/image.c
View File

@ -173,6 +173,8 @@ fail:
static void* winpr_bitmap_write_buffer(const BYTE* data, size_t size, UINT32 width, UINT32 height, static void* winpr_bitmap_write_buffer(const BYTE* data, size_t size, UINT32 width, UINT32 height,
UINT32 stride, UINT32 bpp, UINT32* pSize) UINT32 stride, UINT32 bpp, UINT32* pSize)
{ {
WINPR_ASSERT(data || (size == 0));
void* result = NULL; void* result = NULL;
const size_t bpp_stride = 1ull * width * (bpp / 8); const size_t bpp_stride = 1ull * width * (bpp / 8);
wStream* s = Stream_New(NULL, 1024); wStream* s = Stream_New(NULL, 1024);
@ -265,11 +267,14 @@ fail:
int winpr_image_write(wImage* image, const char* filename) int winpr_image_write(wImage* image, const char* filename)
{ {
WINPR_ASSERT(image);
return winpr_image_write_ex(image, image->type, filename); return winpr_image_write_ex(image, image->type, filename);
} }
int winpr_image_write_ex(wImage* image, UINT32 format, const char* filename) int winpr_image_write_ex(wImage* image, UINT32 format, const char* filename)
{ {
WINPR_ASSERT(image);
size_t size = 0; size_t size = 0;
void* data = winpr_image_write_buffer(image, format, &size); void* data = winpr_image_write_buffer(image, format, &size);
if (!data) if (!data)
@ -688,11 +693,21 @@ static SSIZE_T save_png_to_buffer(UINT32 bpp, UINT32 width, UINT32 height, const
int rc = -1; int rc = -1;
png_structp png_ptr = NULL; png_structp png_ptr = NULL;
png_infop info_ptr = NULL; png_infop info_ptr = NULL;
png_uint_32 bytes_per_row = 0;
png_byte** row_pointers = NULL; png_byte** row_pointers = NULL;
struct png_mem_encode state = { 0 }; struct png_mem_encode state = { 0 };
*pDstData = NULL; *pDstData = NULL;
if (!data || (size == 0))
return 0;
WINPR_ASSERT(pDstData);
const size_t bytes_per_pixel = (bpp + 7) / 8;
const size_t bytes_per_row = width * bytes_per_pixel;
if (size < bytes_per_row * height)
goto fail;
/* Initialize the write struct. */ /* Initialize the write struct. */
png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
if (png_ptr == NULL) if (png_ptr == NULL)
@ -720,8 +735,6 @@ static SSIZE_T save_png_to_buffer(UINT32 bpp, UINT32 width, UINT32 height, const
PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
/* Initialize rows of PNG. */ /* Initialize rows of PNG. */
const size_t bytes_per_pixel = (bpp + 7) / 8;
bytes_per_row = width * bytes_per_pixel;
row_pointers = png_malloc(png_ptr, height * sizeof(png_byte*)); row_pointers = png_malloc(png_ptr, height * sizeof(png_byte*));
for (size_t y = 0; y < height; ++y) for (size_t y = 0; y < height; ++y)
{ {
@ -853,7 +866,7 @@ void* winpr_convert_to_png(const void* data, size_t size, UINT32 width, UINT32 h
*pSize = 0; *pSize = 0;
#if defined(WINPR_UTILS_IMAGE_PNG) #if defined(WINPR_UTILS_IMAGE_PNG)
char* dst = NULL; void* dst = NULL;
SSIZE_T rc = save_png_to_buffer(bpp, width, height, data, size, &dst); SSIZE_T rc = save_png_to_buffer(bpp, width, height, data, size, &dst);
if (rc <= 0) if (rc <= 0)
return NULL; return NULL;
@ -1088,6 +1101,7 @@ const char* winpr_image_format_extension(UINT32 format)
void* winpr_image_write_buffer(wImage* image, UINT32 format, size_t* psize) void* winpr_image_write_buffer(wImage* image, UINT32 format, size_t* psize)
{ {
WINPR_ASSERT(image);
switch (format) switch (format)
{ {
case WINPR_IMAGE_BITMAP: case WINPR_IMAGE_BITMAP: