Browse Source

* fixed potential endless loop if the code page passed to win2iconv()
is not found

git-svn-id: trunk@19195 -

Jonas Maebe 14 years ago
parent
commit
3469942f34
1 changed files with 4 additions and 4 deletions
  1. 4 4
      rtl/unix/winiconv.inc

+ 4 - 4
rtl/unix/winiconv.inc

@@ -364,12 +364,12 @@
         ccp:=win2iconv_arr[i].cp;
         ccp:=win2iconv_arr[i].cp;
         if cp=ccp then
         if cp=ccp then
           break;
           break;
-        if cp>ccp then
-          l:=i+1
+        if cp>=ccp then
+          l:=i
         else
         else
           h:=i-1;
           h:=i-1;
-      until l>h;
-      if l<=h then
+      until l>=h;
+      if cp=win2iconv_arr[i].cp then
         begin
         begin
           { the array has been ordered so that in case multiple alias names
           { the array has been ordered so that in case multiple alias names
             exist, the first entry for the cp is the most commonly supported
             exist, the first entry for the cp is the most commonly supported