Browse Source

* fixed uninitialised var-parameters in isstringconv

git-svn-id: branches/jvmbackend@18539 -
Jonas Maebe 14 years ago
parent
commit
4dfdcfd139
1 changed files with 13 additions and 6 deletions
  1. 13 6
      compiler/jvm/njvmcnv.pas

+ 13 - 6
compiler/jvm/njvmcnv.pas

@@ -674,14 +674,21 @@ implementation
     function isstringconv(var res: boolean): boolean;
     function isstringconv(var res: boolean): boolean;
       begin
       begin
         if is_wide_or_unicode_string(realtodef) then
         if is_wide_or_unicode_string(realtodef) then
-          result:=
-            (realfromdef=java_jlobject) or
-            (realfromdef=java_jlstring)
+          begin
+            result:=true;
+            res:=
+              (realfromdef=java_jlobject) or
+              (realfromdef=java_jlstring)
+          end
         else if is_wide_or_unicode_string(realfromdef) then
         else if is_wide_or_unicode_string(realfromdef) then
-          result:=
-            (realtodef=java_jlobject) or
-            (realtodef=java_jlstring)
+          begin
+            result:=true;
+            res:=
+              (realtodef=java_jlobject) or
+              (realtodef=java_jlstring)
+          end
         else
         else
+          result:=false;
       end;
       end;
 
 
     begin
     begin