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

is not found

git-svn-id: trunk@19195 -
This commit is contained in:
Jonas Maebe 2011-09-23 18:34:31 +00:00
parent 7dd5811828
commit 3469942f34

View File

@ -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 if cp>=ccp then
l:=i+1 l:=i
else else
h:=i-1; h:=i-1;
until l>h; until l>=h;
if l<=h then 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