paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-15 10:51:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

compiler: fix error in length retrieving during the unicode to utf8 conversion

Browse Source 
git-svn-id: trunk@19475 -
This commit is contained in:
paul 2011-10-12 08:13:48 +00:00
parent 39b5babdeb
commit 56ecf146be
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/ncon.pas
View File

@ -1008,9 +1008,10 @@ implementation
if (cp1=CP_UTF8) then
begin
pw:=pcompilerwidestring(value_str);
l:=UnicodeToUtf8(nil,PUnicodeChar(pw^.data),0);
l2:=len;
l:=UnicodeToUtf8(nil,0,PUnicodeChar(pw^.data),l2);
getmem(pc,l);
UnicodeToUtf8(pc,l,PUnicodeChar(pw^.data),getlengthwidestring(pw));
UnicodeToUtf8(pc,l,PUnicodeChar(pw^.data),l2);
len:=l-1;
donewidestring(pw);
value_str:=pc;
@ -1071,7 +1072,7 @@ implementation
initwidestring(pw);
setlengthwidestring(pw,len);
ascii2unicode(value_str,len,cp2,pw);
l:=UnicodeToUtf8(nil,PUnicodeChar(pw^.data),0);
l:=UnicodeToUtf8(nil,0,PUnicodeChar(pw^.data),len);
if l<>len then
ReAllocMem(value_str,l);
len:=l-1;