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

[warnings] fix integer narrowing

Browse Source
This commit is contained in:
akallabeth 2024-10-03 13:15:24 +02:00
parent 6c8c67b385
commit fe8e1950aa
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libfreerdp/core/childsession.c
View File

@ -76,7 +76,8 @@ static int transport_bio_named_write(BIO* bio, const char* buf, int size)
return 0; return 0;
} }
return written; WINPR_ASSERT(written <= INT32_MAX);
return (int)written;
} }
static BOOL treatReadResult(WINPR_BIO_NAMED* ptr, DWORD readBytes) static BOOL treatReadResult(WINPR_BIO_NAMED* ptr, DWORD readBytes)
@ -221,7 +222,7 @@ static int transport_bio_named_read(BIO* bio, char* buf, int size)
if ((size >= 0) && ret) if ((size >= 0) && ret)
{ {
DataChunk chunks[2] = { 0 }; DataChunk chunks[2] = { 0 };
int nchunks = ringbuffer_peek(&ptr->readBuffer, chunks, ret); const int nchunks = ringbuffer_peek(&ptr->readBuffer, chunks, ret);
for (int i = 0; i < nchunks; i++) for (int i = 0; i < nchunks; i++)
{ {
memcpy(buf, chunks[i].data, chunks[i].size); memcpy(buf, chunks[i].data, chunks[i].size);
@ -230,7 +231,7 @@ static int transport_bio_named_read(BIO* bio, char* buf, int size)
ringbuffer_commit_read_bytes(&ptr->readBuffer, ret); ringbuffer_commit_read_bytes(&ptr->readBuffer, ret);
WLog_VRB(TAG, "(%d)=%d nchunks=%d", size, ret, nchunks); WLog_VRB(TAG, "(%d)=%" PRIdz " nchunks=%d", size, ret, nchunks);
} }
if (!ringbuffer_used(&ptr->readBuffer)) if (!ringbuffer_used(&ptr->readBuffer))
@ -245,7 +246,8 @@ static int transport_bio_named_read(BIO* bio, char* buf, int size)
if (ret <= 0) if (ret <= 0)
BIO_set_flags(bio, (BIO_FLAGS_SHOULD_RETRY | BIO_FLAGS_READ)); BIO_set_flags(bio, (BIO_FLAGS_SHOULD_RETRY | BIO_FLAGS_READ));
return ret; WINPR_ASSERT(ret <= INT32_MAX);
return (int)ret;
} }
static int transport_bio_named_puts(BIO* bio, const char* str) static int transport_bio_named_puts(BIO* bio, const char* str)
@ -253,7 +255,7 @@ static int transport_bio_named_puts(BIO* bio, const char* str)
WINPR_ASSERT(bio); WINPR_ASSERT(bio);
WINPR_ASSERT(str); WINPR_ASSERT(str);
return transport_bio_named_write(bio, str, strlen(str)); return transport_bio_named_write(bio, str, (int)strnlen(str, INT32_MAX));
} }
static int transport_bio_named_gets(BIO* bio, char* str, int size) static int transport_bio_named_gets(BIO* bio, char* str, int size)