paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-05 23:47:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

* don't crash when someone uses an integer value to declare a wide/unicode

Browse Source 
string (mantis #12329)

git-svn-id: trunk@11875 -
This commit is contained in:
Jonas Maebe 2008-10-10 15:01:56 +00:00
parent 8adde04a0b
commit 79850c5027
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -8109,6 +8109,7 @@ tests/webtbf/tw11846c.pp svneol=native#text/plain
tests/webtbf/tw11848a.pp svneol=native#text/plain
tests/webtbf/tw11849a.pp svneol=native#text/plain
tests/webtbf/tw11862a.pp svneol=native#text/plain
tests/webtbf/tw12329.pp svneol=native#text/plain
tests/webtbf/tw1238.pp svneol=native#text/plain
tests/webtbf/tw1251a.pp svneol=native#text/plain
tests/webtbf/tw1270.pp svneol=native#text/plain

10
compiler/ptconst.pas
View File

@ -646,8 +646,14 @@ implementation
{ convert to the expected string type so that
for widestrings strval is a pcompilerwidestring }
inserttypeconv(n,def);
strlength:=tstringconstnode(n).len;
strval:=tstringconstnode(n).value_str;
if not codegenerror then
begin
strlength:=tstringconstnode(n).len;
strval:=tstringconstnode(n).value_str;
end
else
{ an error occurred trying to convert the result to a string }
strlength:=-1;
end
else if is_constcharnode(n) then
begin

17
tests/webtbf/tw12329.pp Normal file
View File

@ -0,0 +1,17 @@
{ %fail }
unit tw12329;
{$mode objfpc}{$h+}
interface
implementation
procedure test;
const
arr: array[0..1] of WideString = (0, 0);
begin
end;
end.