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

merge r17438 from cpstrnew branch by michael:

Browse Source 
* Applied patch from Inoussa to fix copy of unicode string

git-svn-id: trunk@19112 -
This commit is contained in:
paul 2011-09-17 13:27:26 +00:00
parent 0550c547f4
commit f8b5920f31
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -10528,6 +10528,7 @@ tests/test/tunistr4.pp svneol=native#text/plain
tests/test/tunistr5.pp svneol=native#text/plain tests/test/tunistr5.pp svneol=native#text/plain
tests/test/tunistr6.pp svneol=native#text/plain tests/test/tunistr6.pp svneol=native#text/plain
tests/test/tunistr7.pp svneol=native#text/plain tests/test/tunistr7.pp svneol=native#text/plain
tests/test/tunistrcopy.pp svneol=native#text/plain
tests/test/tunit1.pp svneol=native#text/plain tests/test/tunit1.pp svneol=native#text/plain
tests/test/tunit2.pp svneol=native#text/plain tests/test/tunit2.pp svneol=native#text/plain
tests/test/tunit3.pp svneol=native#text/plain tests/test/tunit3.pp svneol=native#text/plain

2
rtl/inc/ustrings.inc
View File

@ -1585,7 +1585,7 @@ begin
if ResultAddress<>Nil then if ResultAddress<>Nil then
begin begin
Move (PUnicodeChar(S)[Index],ResultAddress^,Size*sizeof(UnicodeChar)); Move (PUnicodeChar(S)[Index],ResultAddress^,Size*sizeof(UnicodeChar));
PUnicodeRec(ResultAddress-UnicodeFirstOff)^.Len:=Size*sizeof(UnicodeChar); PUnicodeRec(ResultAddress-UnicodeFirstOff)^.Len:=Size;
PUnicodeChar(ResultAddress+Size*sizeof(UnicodeChar))^:=#0; PUnicodeChar(ResultAddress+Size*sizeof(UnicodeChar))^:=#0;
end; end;
end; end;

9
tests/test/tunistrcopy.pp Normal file
View File

@ -0,0 +1,9 @@
var
a, b : UnicodeString;
begin
a := '12345';
b := Copy(a,1,Length(a));
if (a <> b) then
Halt(1);
WriteLn('ok');
end.