浏览代码

* fix range check error if cstringpattern is empty

git-svn-id: trunk@14850 -
pierre 15 年之前
父节点
当前提交
f8144cc627
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      compiler/scanner.pas

+ 4 - 1
compiler/scanner.pas

@@ -3855,7 +3855,10 @@ In case not, the value returned can be arbitrary.
                                 begin
                                 begin
                                   if not iswidestring then
                                   if not iswidestring then
                                    begin
                                    begin
-                                     ascii2unicode(@cstringpattern[1],len,patternw);
+                                     if len>0 then
+                                       ascii2unicode(@cstringpattern[1],len,patternw)
+                                     else
+                                       ascii2unicode(nil,len,patternw);
                                      iswidestring:=true;
                                      iswidestring:=true;
                                      len:=0;
                                      len:=0;
                                    end;
                                    end;