mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10706 from akallabeth/narrow-fixes-more-more-more

Browse Source 
Narrow fixes more more more
This commit is contained in:
Martin Fleisz 2024-10-14 10:48:17 +02:00 committed by GitHub
commit e6abf49a80
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 105 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libfreerdp/cache/persistent.c vendored
View File

@ -32,7 +32,7 @@ struct rdp_persistent_cache
{
FILE* fp;
BOOL write;
UINT32 version;
int version;
int count;
char* filename;
BYTE* bmpData;
@ -81,7 +81,6 @@ static int persistent_cache_read_entry_v2(rdpPersistentCache* persistent,
static int persistent_cache_write_entry_v2(rdpPersistentCache* persistent,
const PERSISTENT_CACHE_ENTRY* entry)
{
int padding = 0;
PERSISTENT_CACHE_ENTRY_V2 entry2 = { 0 };
WINPR_ASSERT(persistent);
@ -95,17 +94,17 @@ static int persistent_cache_write_entry_v2(rdpPersistentCache* persistent,
if (!entry2.flags)
entry2.flags = 0x00000011;
if (fwrite((void*)&entry2, sizeof(entry2), 1, persistent->fp) != 1)
if (fwrite(&entry2, sizeof(entry2), 1, persistent->fp) != 1)
return -1;
if (fwrite((void*)entry->data, entry->size, 1, persistent->fp) != 1)
if (fwrite(entry->data, entry->size, 1, persistent->fp) != 1)
return -1;
if (0x4000 > entry->size)
{
padding = 0x4000 - entry->size;
const size_t padding = 0x4000 - entry->size;
if (fwrite((void*)persistent->bmpData, padding, 1, persistent->fp) != 1)
if (fwrite(persistent->bmpData, padding, 1, persistent->fp) != 1)
return -1;
}
@ -323,7 +322,8 @@ int persistent_cache_open(rdpPersistentCache* persistent, const char* filename,
if (persistent->write)
{
persistent->version = version;
WINPR_ASSERT(version <= INT32_MAX);
persistent->version = (int)version;
return persistent_cache_open_write(persistent);
}

5
libfreerdp/common/settings.c
View File

@ -781,13 +781,16 @@ void freerdp_addin_argv_free(ADDIN_ARGV* args)
ADDIN_ARGV* freerdp_addin_argv_new(size_t argc, const char* argv[])
{
if (argc > INT32_MAX)
return NULL;
ADDIN_ARGV* args = calloc(1, sizeof(ADDIN_ARGV));
if (!args)
return NULL;
if (argc == 0)
return args;
args->argc = argc;
args->argc = (int)argc;
args->argv = calloc(argc, sizeof(char*));
if (!args->argv)
goto fail;

20
libfreerdp/core/gcc.c
View File

@ -2120,18 +2120,18 @@ BOOL gcc_read_client_monitor_data(wStream* s, rdpMcs* mcs)
for (UINT32 index = 0; index < monitorCount; index++)
{
UINT32 left = 0;
UINT32 top = 0;
UINT32 right = 0;
UINT32 bottom = 0;
UINT32 flags = 0;
INT32 left = 0;
INT32 top = 0;
INT32 right = 0;
INT32 bottom = 0;
INT32 flags = 0;
rdpMonitor* current = &settings->MonitorDefArray[index];
Stream_Read_UINT32(s, left); /* left */
Stream_Read_UINT32(s, top); /* top */
Stream_Read_UINT32(s, right); /* right */
Stream_Read_UINT32(s, bottom); /* bottom */
Stream_Read_UINT32(s, flags); /* flags */
Stream_Read_INT32(s, left); /* left */
Stream_Read_INT32(s, top); /* top */
Stream_Read_INT32(s, right); /* right */
Stream_Read_INT32(s, bottom); /* bottom */
Stream_Read_INT32(s, flags); /* flags */
current->x = left;
current->y = top;
current->width = right - left + 1;

54
libfreerdp/core/transport.c
View File

@ -1038,7 +1038,10 @@ SSIZE_T transport_parse_pdu(rdpTransport* transport, wStream* s, BOOL* incomplet
pduLength = parse_default_mode_pdu(transport, s);
if (pduLength == 0)
return pduLength;
return 0;
if (pduLength > SSIZE_MAX)
return -1;
const size_t len = Stream_Length(s);
if (len > pduLength)
@ -1047,7 +1050,7 @@ SSIZE_T transport_parse_pdu(rdpTransport* transport, wStream* s, BOOL* incomplet
if (incomplete)
*incomplete = len < pduLength;
return pduLength;
return (int)pduLength;
}
static int transport_default_read_pdu(rdpTransport* transport, wStream* s)
@ -1067,9 +1070,9 @@ static int transport_default_read_pdu(rdpTransport* transport, wStream* s)
BYTE c = '\0';
do
{
const int rc = transport_read_layer(transport, &c, 1);
const SSIZE_T rc = transport_read_layer(transport, &c, 1);
if (rc != 1)
return rc;
return (rc == 0) ? 0 : -1;
if (!Stream_EnsureRemainingCapacity(s, 1))
return -1;
Stream_Write_UINT8(s, c);
@ -1079,9 +1082,9 @@ static int transport_default_read_pdu(rdpTransport* transport, wStream* s)
{
if (!Stream_EnsureCapacity(s, 4))
return -1;
const int rc = transport_read_layer_bytes(transport, s, 4);
const SSIZE_T rc = transport_read_layer_bytes(transport, s, 4);
if (rc != 1)
return rc;
return (rc == 0) ? 0 : -1;
}
else
{
@ -1089,12 +1092,13 @@ static int transport_default_read_pdu(rdpTransport* transport, wStream* s)
status = transport_parse_pdu(transport, s, &incomplete);
while ((status == 0) && incomplete)
{
int rc = 0;
if (!Stream_EnsureRemainingCapacity(s, 1))
return -1;
rc = transport_read_layer_bytes(transport, s, 1);
SSIZE_T rc = transport_read_layer_bytes(transport, s, 1);
if (rc > INT32_MAX)
return INT32_MAX;
if (rc != 1)
return rc;
return (int)rc;
status = transport_parse_pdu(transport, s, &incomplete);
}
@ -1114,7 +1118,11 @@ static int transport_default_read_pdu(rdpTransport* transport, wStream* s)
status = transport_read_layer_bytes(transport, s, pduLength - Stream_GetPosition(s));
if (status != 1)
return status;
{
if ((status < INT32_MIN) || (status > INT32_MAX))
return -1;
return (int)status;
}
if (Stream_GetPosition(s) >= pduLength)
WLog_Packet(transport->log, WLOG_TRACE, Stream_Buffer(s), pduLength,
@ -1123,7 +1131,10 @@ static int transport_default_read_pdu(rdpTransport* transport, wStream* s)
Stream_SealLength(s);
Stream_SetPosition(s, 0);
return Stream_Length(s);
const size_t len = Stream_Length(s);
if (len > INT32_MAX)
return -1;
return (int)len;
}
int transport_write(rdpTransport* transport, wStream* s)
@ -1136,10 +1147,7 @@ int transport_write(rdpTransport* transport, wStream* s)
static int transport_default_write(rdpTransport* transport, wStream* s)
{
size_t length = 0;
int status = -1;
int writtenlength = 0;
rdpRdp* rdp = NULL;
rdpContext* context = transport_get_context(transport);
WINPR_ASSERT(transport);
@ -1150,7 +1158,7 @@ static int transport_default_write(rdpTransport* transport, wStream* s)
Stream_AddRef(s);
rdp = context->rdp;
rdpRdp* rdp = context->rdp;
if (!rdp)
goto fail;
@ -1158,8 +1166,8 @@ static int transport_default_write(rdpTransport* transport, wStream* s)
if (!transport->frontBio)
goto out_cleanup;
length = Stream_GetPosition(s);
writtenlength = length;
size_t length = Stream_GetPosition(s);
size_t writtenlength = length;
Stream_SetPosition(s, 0);
if (length > 0)
@ -1171,7 +1179,8 @@ static int transport_default_write(rdpTransport* transport, wStream* s)
while (length > 0)
{
ERR_clear_error();
status = BIO_write(transport->frontBio, Stream_ConstPointer(s), length);
const int towrite = (length > INT32_MAX) ? INT32_MAX : (int)length;
status = BIO_write(transport->frontBio, Stream_ConstPointer(s), towrite);
if (status <= 0)
{
@ -1223,8 +1232,8 @@ static int transport_default_write(rdpTransport* transport, wStream* s)
}
}
length -= status;
Stream_Seek(s, status);
length -= (size_t)status;
Stream_Seek(s, (size_t)status);
}
transport->written += writtenlength;
@ -1374,7 +1383,7 @@ BOOL transport_is_write_blocked(rdpTransport* transport)
{
WINPR_ASSERT(transport);
WINPR_ASSERT(transport->frontBio);
return BIO_write_blocked(transport->frontBio);
return BIO_write_blocked(transport->frontBio) != 0;
}
int transport_drain_output_buffer(rdpTransport* transport)
@ -1388,7 +1397,8 @@ int transport_drain_output_buffer(rdpTransport* transport)
if (BIO_flush(transport->frontBio) < 1)
return -1;
status |= BIO_write_blocked(transport->frontBio);
const long rc = BIO_write_blocked(transport->frontBio);
status = (rc != 0);
}
return status;

2
libfreerdp/crypto/certificate.c
View File

@ -1289,7 +1289,7 @@ rdpCertificate* freerdp_certificate_new_from_x509(const X509* xcert, const STACK
goto fail;
if (chain)
cert->chain = X509_chain_up_ref(chain);
cert->chain = sk_X509_deep_copy(chain, X509_dup, X509_free);
return cert;
fail:

8
libfreerdp/primitives/prim_YCoCg.c
View File

@ -51,10 +51,10 @@ static pstatus_t general_YCoCgToRGB_8u_AC4R(const BYTE* pSrc, INT32 srcStep, BYT
const INT16 Cg = convert(*sptr++, shift);
const INT16 Co = convert(*sptr++, shift);
const INT16 Y = *sptr++; /* UINT8->INT16 */
const INT16 T = Y - Cg;
const INT16 B = T + Co;
const INT16 G = Y + Cg;
const INT16 R = T - Co;
const INT16 T = (INT16)(Y - Cg);
const INT16 B = (INT16)(T + Co);
const INT16 G = (INT16)(Y + Cg);
const INT16 R = (INT16)(T - Co);
BYTE A = *sptr++;
if (!withAlpha)

6
server/proxy/pf_config.c
View File

@ -930,8 +930,10 @@ static BOOL pf_config_copy_string_list(char*** dst, size_t* size, char** src, si
*dst = NULL;
*size = 0;
if (srcSize == 0)
return TRUE;
if (srcSize > INT32_MAX)
return FALSE;
if (srcSize != 0)
{
char* csv = CommandLineToCommaSeparatedValues(srcSize, src);
*dst = CommandLineParseCommaSeparatedValues(csv, size);

15
server/shadow/X11/x11_shadow.c
View File

@ -722,14 +722,19 @@ static BOOL x11_shadow_check_resize(x11ShadowSubsystem* subsystem)
/* Screen size changed. Refresh monitor definitions and trigger screen resize */
subsystem->common.numMonitors = x11_shadow_enum_monitors(subsystem->common.monitors, 16);
shadow_screen_resize(subsystem->common.server->screen);
subsystem->width = attr.width;
subsystem->height = attr.height;
if (!shadow_screen_resize(subsystem->common.server->screen))
return FALSE;
WINPR_ASSERT(attr.width > 0);
WINPR_ASSERT(attr.height > 0);
subsystem->width = (UINT32)attr.width;
subsystem->height = (UINT32)attr.height;
virtualScreen->left = 0;
virtualScreen->top = 0;
virtualScreen->right = subsystem->width - 1;
virtualScreen->bottom = subsystem->height - 1;
virtualScreen->right = attr.width - 1;
virtualScreen->bottom = attr.height - 1;
virtualScreen->flags = 1;
return TRUE;
}

26
server/shadow/shadow_screen.c
View File

@ -119,23 +119,22 @@ void shadow_screen_free(rdpShadowScreen* screen)
BOOL shadow_screen_resize(rdpShadowScreen* screen)
{
int x = 0;
int y = 0;
int width = 0;
int height = 0;
MONITOR_DEF* primary = NULL;
rdpShadowSubsystem* subsystem = NULL;
if (!screen)
return FALSE;
subsystem = screen->server->subsystem;
primary = &(subsystem->monitors[subsystem->selectedMonitor]);
WINPR_ASSERT(screen->server);
x = primary->left;
y = primary->top;
width = primary->right - primary->left + 1;
height = primary->bottom - primary->top + 1;
rdpShadowSubsystem* subsystem = screen->server->subsystem;
WINPR_ASSERT(subsystem);
WINPR_ASSERT(subsystem->monitors);
MONITOR_DEF* primary = &(subsystem->monitors[subsystem->selectedMonitor]);
WINPR_ASSERT(primary);
const INT32 x = primary->left;
const INT32 y = primary->top;
const INT32 width = primary->right - primary->left + 1;
const INT32 height = primary->bottom - primary->top + 1;
WINPR_ASSERT(x >= 0);
WINPR_ASSERT(x <= UINT16_MAX);
@ -145,6 +144,7 @@ BOOL shadow_screen_resize(rdpShadowScreen* screen)
WINPR_ASSERT(width <= UINT16_MAX);
WINPR_ASSERT(height >= 0);
WINPR_ASSERT(height <= UINT16_MAX);
if (shadow_surface_resize(screen->primary, (UINT16)x, (UINT16)y, (UINT16)width,
(UINT16)height) &&
shadow_surface_resize(screen->lobby, (UINT16)x, (UINT16)y, (UINT16)width, (UINT16)height))

12
winpr/libwinpr/crt/string.c
View File

@ -469,7 +469,7 @@ LPSTR CharUpperA(LPSTR lpsz)
char c = *lpsz;
if ((c >= 'a') && (c <= 'z'))
c = c - 'a' + 'A';
c = (char)(c - 'a' + 'A');
*lpsz = c;
return lpsz;
@ -478,7 +478,7 @@ LPSTR CharUpperA(LPSTR lpsz)
for (size_t i = 0; i < length; i++)
{
if ((lpsz[i] >= 'a') && (lpsz[i] <= 'z'))
lpsz[i] = lpsz[i] - 'a' + 'A';
lpsz[i] = (char)(lpsz[i] - 'a' + 'A');
}
return lpsz;
@ -524,7 +524,7 @@ DWORD CharUpperBuffA(LPSTR lpsz, DWORD cchLength)
for (DWORD i = 0; i < cchLength; i++)
{
if ((lpsz[i] >= 'a') && (lpsz[i] <= 'z'))
lpsz[i] = lpsz[i] - 'a' + 'A';
lpsz[i] = (char)(lpsz[i] - 'a' + 'A');
}
return cchLength;
@ -561,7 +561,7 @@ LPSTR CharLowerA(LPSTR lpsz)
char c = *lpsz;
if ((c >= 'A') && (c <= 'Z'))
c = c - 'A' + 'a';
c = (char)(c - 'A' + 'a');
*lpsz = c;
return lpsz;
@ -570,7 +570,7 @@ LPSTR CharLowerA(LPSTR lpsz)
for (size_t i = 0; i < length; i++)
{
if ((lpsz[i] >= 'A') && (lpsz[i] <= 'Z'))
lpsz[i] = lpsz[i] - 'A' + 'a';
lpsz[i] = (char)(lpsz[i] - 'A' + 'a');
}
return lpsz;
@ -590,7 +590,7 @@ DWORD CharLowerBuffA(LPSTR lpsz, DWORD cchLength)
for (DWORD i = 0; i < cchLength; i++)
{
if ((lpsz[i] >= 'A') && (lpsz[i] <= 'Z'))
lpsz[i] = lpsz[i] - 'A' + 'a';
lpsz[i] = (char)(lpsz[i] - 'A' + 'a');
}
return cchLength;

21
winpr/libwinpr/thread/process.c
View File

@ -263,7 +263,12 @@ static BOOL CreateProcessExA(HANDLE hToken, DWORD dwLogonFlags, LPCSTR lpApplica
#ifdef F_MAXFD // on some BSD derivates
maxfd = fcntl(0, F_MAXFD);
#else
maxfd = sysconf(_SC_OPEN_MAX);
{
const long rc = sysconf(_SC_OPEN_MAX);
if ((rc < INT32_MIN) || (rc > INT32_MAX))
goto finish;
maxfd = (int)rc;
}
#endif
for (int fd = 3; fd < maxfd; fd++)
@ -555,24 +560,26 @@ static int pidfd_open(pid_t pid)
#define PIDFD_NONBLOCK O_NONBLOCK
#endif /* PIDFD_NONBLOCK */
int fd = syscall(__NR_pidfd_open, pid, PIDFD_NONBLOCK);
long fd = syscall(__NR_pidfd_open, pid, PIDFD_NONBLOCK);
if (fd < 0 && errno == EINVAL)
{
/* possibly PIDFD_NONBLOCK is not supported, let's try to create a pidfd and set it
* non blocking afterward */
int flags = 0;
fd = syscall(__NR_pidfd_open, pid, 0);
if (fd < 0)
if ((fd < 0) || (fd > INT32_MAX))
return -1;
flags = fcntl(fd, F_GETFL);
if (flags < 0 || fcntl(fd, F_SETFL, flags | O_NONBLOCK) < 0)
flags = fcntl((int)fd, F_GETFL);
if ((flags < 0) || fcntl((int)fd, F_SETFL, flags | O_NONBLOCK) < 0)
{
close(fd);
close((int)fd);
fd = -1;
}
}
return fd;
if ((fd < 0) || (fd > INT32_MAX))
return -1;
return (int)fd;
#else
return -1;
#endif