[covertity] fix various warnings
This commit is contained in:
parent
b17b07885a
commit
8d783d5189
@ -607,7 +607,8 @@ static BOOL ffmpeg_decode(AVCodecContext* dec_ctx, AVPacket* pkt, AVFrame* frame
|
|||||||
const size_t channels = resampled->ch_layout.nb_channels;
|
const size_t channels = resampled->ch_layout.nb_channels;
|
||||||
#endif
|
#endif
|
||||||
const size_t data_size = channels * resampled->nb_samples * 2;
|
const size_t data_size = channels * resampled->nb_samples * 2;
|
||||||
Stream_EnsureRemainingCapacity(out, data_size);
|
if (!Stream_EnsureRemainingCapacity(out, data_size))
|
||||||
|
return FALSE;
|
||||||
Stream_Write(out, resampled->data[0], data_size);
|
Stream_Write(out, resampled->data[0], data_size);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3035,7 +3035,9 @@ static BOOL rdp_apply_bitmap_codecs_capability_set(rdpSettings* settings, const
|
|||||||
/* only enable a codec if we've announced/enabled it before */
|
/* only enable a codec if we've announced/enabled it before */
|
||||||
settings->RemoteFxCodec = settings->RemoteFxCodec && src->RemoteFxCodecId;
|
settings->RemoteFxCodec = settings->RemoteFxCodec && src->RemoteFxCodecId;
|
||||||
settings->RemoteFxImageCodec = settings->RemoteFxImageCodec && src->RemoteFxImageCodec;
|
settings->RemoteFxImageCodec = settings->RemoteFxImageCodec && src->RemoteFxImageCodec;
|
||||||
freerdp_settings_set_bool(settings, FreeRDP_NSCodec, settings->NSCodec && src->NSCodec);
|
if (!freerdp_settings_set_bool(settings, FreeRDP_NSCodec,
|
||||||
|
settings->NSCodec && src->NSCodec))
|
||||||
|
return FALSE;
|
||||||
settings->JpegCodec = src->JpegCodec;
|
settings->JpegCodec = src->JpegCodec;
|
||||||
}
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
@ -3237,10 +3239,14 @@ static BOOL rdp_read_bitmap_codecs_capability_set(wStream* s, rdpSettings* setti
|
|||||||
bitmapCodecCount--;
|
bitmapCodecCount--;
|
||||||
|
|
||||||
/* only enable a codec if we've announced/enabled it before */
|
/* only enable a codec if we've announced/enabled it before */
|
||||||
settings->RemoteFxCodec = guidRemoteFx;
|
if (!freerdp_settings_set_bool(settings, FreeRDP_RemoteFxCodec, guidRemoteFx))
|
||||||
settings->RemoteFxImageCodec = guidRemoteFxImage;
|
return FALSE;
|
||||||
freerdp_settings_set_bool(settings, FreeRDP_NSCodec, guidNSCodec);
|
if (!freerdp_settings_set_bool(settings, FreeRDP_RemoteFxImageCodec, guidRemoteFxImage))
|
||||||
settings->JpegCodec = FALSE;
|
return FALSE;
|
||||||
|
if (!freerdp_settings_set_bool(settings, FreeRDP_NSCodec, guidNSCodec))
|
||||||
|
return FALSE;
|
||||||
|
if (!freerdp_settings_set_bool(settings, FreeRDP_JpegCodec, FALSE))
|
||||||
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
@ -4492,9 +4498,12 @@ BOOL rdp_recv_confirm_active(rdpRdp* rdp, wStream* s, UINT16 pduLength)
|
|||||||
if (!settings->ReceivedCapabilities[CAPSET_TYPE_BITMAP_CODECS])
|
if (!settings->ReceivedCapabilities[CAPSET_TYPE_BITMAP_CODECS])
|
||||||
{
|
{
|
||||||
/* client does not support bitmap codecs */
|
/* client does not support bitmap codecs */
|
||||||
settings->RemoteFxCodec = FALSE;
|
if (!freerdp_settings_set_bool(settings, FreeRDP_RemoteFxCodec, FALSE))
|
||||||
freerdp_settings_set_bool(settings, FreeRDP_NSCodec, FALSE);
|
return FALSE;
|
||||||
settings->JpegCodec = FALSE;
|
if (!freerdp_settings_set_bool(settings, FreeRDP_NSCodec, FALSE))
|
||||||
|
return FALSE;
|
||||||
|
if (!freerdp_settings_set_bool(settings, FreeRDP_JpegCodec, FALSE))
|
||||||
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!settings->ReceivedCapabilities[CAPSET_TYPE_MULTI_FRAGMENT_UPDATE])
|
if (!settings->ReceivedCapabilities[CAPSET_TYPE_MULTI_FRAGMENT_UPDATE])
|
||||||
|
@ -391,8 +391,10 @@ static BOOL wst_handle_ok_or_forbidden(rdpWst* wst, HttpResponse** ppresponse, D
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
free(wst->gwpath);
|
free(wst->gwpath);
|
||||||
wst->gwpath = urlWithAuth;
|
wst->gwpath = urlWithAuth;
|
||||||
http_context_set_uri(wst->http, wst->gwpath);
|
if (!http_context_set_uri(wst->http, wst->gwpath))
|
||||||
http_context_enable_websocket_upgrade(wst->http, TRUE);
|
return FALSE;
|
||||||
|
if (!http_context_enable_websocket_upgrade(wst->http, TRUE))
|
||||||
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!wst_send_http_request(wst, wst->tls))
|
if (!wst_send_http_request(wst, wst->tls))
|
||||||
|
@ -818,7 +818,7 @@ static int nla_server_authenticate(rdpNla* nla)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
nla_send(nla);
|
(void)nla_send(nla);
|
||||||
/* Access Denied */
|
/* Access Denied */
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
@ -79,16 +79,23 @@ static char* crypto_print_name(const X509_NAME* name)
|
|||||||
{
|
{
|
||||||
UINT64 size = BIO_number_written(outBIO);
|
UINT64 size = BIO_number_written(outBIO);
|
||||||
if (size > INT_MAX)
|
if (size > INT_MAX)
|
||||||
return NULL;
|
goto fail;
|
||||||
buffer = calloc(1, (size_t)size + 1);
|
buffer = calloc(1, (size_t)size + 1);
|
||||||
|
|
||||||
if (!buffer)
|
if (!buffer)
|
||||||
return NULL;
|
goto fail;
|
||||||
|
|
||||||
ERR_clear_error();
|
ERR_clear_error();
|
||||||
BIO_read(outBIO, buffer, (int)size);
|
const int rc = BIO_read(outBIO, buffer, (int)size);
|
||||||
|
if (rc <= 0)
|
||||||
|
{
|
||||||
|
free(buffer);
|
||||||
|
buffer = NULL;
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fail:
|
||||||
BIO_free_all(outBIO);
|
BIO_free_all(outBIO);
|
||||||
return buffer;
|
return buffer;
|
||||||
}
|
}
|
||||||
|
@ -886,7 +886,7 @@ static WIN32_FILE_SEARCH* file_search_new(const char* name, size_t namelen, cons
|
|||||||
if (!pFileSearch)
|
if (!pFileSearch)
|
||||||
return NULL;
|
return NULL;
|
||||||
WINPR_ASSERT(sizeof(file_search_magic) == sizeof(pFileSearch->magic));
|
WINPR_ASSERT(sizeof(file_search_magic) == sizeof(pFileSearch->magic));
|
||||||
strncpy(pFileSearch->magic, file_search_magic, sizeof(pFileSearch->magic));
|
memcpy(pFileSearch->magic, file_search_magic, sizeof(pFileSearch->magic));
|
||||||
|
|
||||||
pFileSearch->lpPath = strndup(name, namelen);
|
pFileSearch->lpPath = strndup(name, namelen);
|
||||||
pFileSearch->lpPattern = strndup(pattern, patternlen);
|
pFileSearch->lpPattern = strndup(pattern, patternlen);
|
||||||
|
@ -830,6 +830,8 @@ static SECURITY_STATUS SEC_ENTRY negotiate_InitializeSecurityContextW(
|
|||||||
if (context->state == NEGOTIATE_STATE_NEGORESP)
|
if (context->state == NEGOTIATE_STATE_NEGORESP)
|
||||||
{
|
{
|
||||||
/* Store the mech token in the output buffer */
|
/* Store the mech token in the output buffer */
|
||||||
|
if (!output_buffer)
|
||||||
|
goto cleanup;
|
||||||
CopyMemory(&output_token.mechToken, output_buffer, sizeof(SecBuffer));
|
CopyMemory(&output_token.mechToken, output_buffer, sizeof(SecBuffer));
|
||||||
|
|
||||||
mech_input_buffers[0] = input_token.mechToken;
|
mech_input_buffers[0] = input_token.mechToken;
|
||||||
|
Loading…
Reference in New Issue
Block a user