From 79850c5027260773a565b2b0f61a77cdee2480bc Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Fri, 10 Oct 2008 15:01:56 +0000
Subject: [PATCH]   * don't crash when someone uses an integer value to declare
 a wide/unicode    string (mantis #12329)

git-svn-id: trunk@11875 -
---
 .gitattributes          |  1 +
 compiler/ptconst.pas    | 10 ++++++++--
 tests/webtbf/tw12329.pp | 17 +++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 tests/webtbf/tw12329.pp

diff --git a/.gitattributes b/.gitattributes
index 3cd5023a72..4cfc538685 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -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
diff --git a/compiler/ptconst.pas b/compiler/ptconst.pas
index 2106c5c0a2..feb01f2411 100644
--- a/compiler/ptconst.pas
+++ b/compiler/ptconst.pas
@@ -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
diff --git a/tests/webtbf/tw12329.pp b/tests/webtbf/tw12329.pp
new file mode 100644
index 0000000000..b2528d92d7
--- /dev/null
+++ b/tests/webtbf/tw12329.pp
@@ -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.