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

[winpr,crt] fix unicode conversion

Browse Source 
fix erroneous cast to wrong pointer type
This commit is contained in:
Armin Novak 2023-08-28 12:49:08 +02:00 committed by akallabeth
parent d6f9d33a7d
commit fe2595eaeb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winpr/libwinpr/crt/unicode_builtin.c
View File

@ -543,7 +543,7 @@ static ConversionResult winpr_ConvertUTF8toUTF16_Internal(const uint8_t** source
static int winpr_ConvertUTF8toUTF16(const uint8_t* src, int cchSrc, uint16_t* dst, int cchDst) static int winpr_ConvertUTF8toUTF16(const uint8_t* src, int cchSrc, uint16_t* dst, int cchDst)
{ {
int length; size_t length;
uint16_t* dstBeg = NULL; uint16_t* dstBeg = NULL;
uint16_t* dstEnd = NULL; uint16_t* dstEnd = NULL;
const uint8_t* srcBeg; const uint8_t* srcBeg;
@ -561,7 +561,7 @@ static int winpr_ConvertUTF8toUTF16(const uint8_t* src, int cchSrc, uint16_t* ds
result = result =
winpr_ConvertUTF8toUTF16_Internal(&srcBeg, srcEnd, &dstBeg, dstEnd, strictConversion); winpr_ConvertUTF8toUTF16_Internal(&srcBeg, srcEnd, &dstBeg, dstEnd, strictConversion);
length = (uintptr_t)dstBeg - ((uintptr_t)NULL); length = dstBeg - (uint16_t*)NULL;
} }
else else
{ {
@ -585,7 +585,7 @@ static int winpr_ConvertUTF8toUTF16(const uint8_t* src, int cchSrc, uint16_t* ds
static int winpr_ConvertUTF16toUTF8(const uint16_t* src, int cchSrc, uint8_t* dst, int cchDst) static int winpr_ConvertUTF16toUTF8(const uint16_t* src, int cchSrc, uint8_t* dst, int cchDst)
{ {
int length; size_t length;
uint8_t* dstBeg = NULL; uint8_t* dstBeg = NULL;
uint8_t* dstEnd = NULL; uint8_t* dstEnd = NULL;
const uint16_t* srcBeg; const uint16_t* srcBeg;
@ -603,7 +603,7 @@ static int winpr_ConvertUTF16toUTF8(const uint16_t* src, int cchSrc, uint8_t* ds
result = result =
winpr_ConvertUTF16toUTF8_Internal(&srcBeg, srcEnd, &dstBeg, dstEnd, strictConversion); winpr_ConvertUTF16toUTF8_Internal(&srcBeg, srcEnd, &dstBeg, dstEnd, strictConversion);
length = (uintptr_t)dstBeg - ((uintptr_t)NULL); length = dstBeg - ((uint8_t*)NULL);
} }
else else
{ {