summaryrefslogtreecommitdiff
path: root/packages/fcl-base
diff options
context:
space:
mode:
authormarco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2>2009-11-07 16:24:06 +0000
committermarco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2>2009-11-07 16:24:06 +0000
commit28c09cf1e3692fedc7b023257cad3543a7ca99d8 (patch)
treecb536850466a10a6336043d7ea66d08e23430a32 /packages/fcl-base
parent7d66615ee26bc6b667bf2ff5ac05ca9dfcc15bb1 (diff)
downloadfpc-28c09cf1e3692fedc7b023257cad3543a7ca99d8.tar.gz
* Patch for gettext empty string problem, Mantis 14902
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@14102 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/fcl-base')
-rw-r--r--packages/fcl-base/src/gettext.pp7
1 files changed, 6 insertions, 1 deletions
diff --git a/packages/fcl-base/src/gettext.pp b/packages/fcl-base/src/gettext.pp
index e6223125f0..6c86c060b9 100644
--- a/packages/fcl-base/src/gettext.pp
+++ b/packages/fcl-base/src/gettext.pp
@@ -174,12 +174,17 @@ function TMOFile.Translate(AOrig: PChar; ALen: Integer; AHash: LongWord): String
var
idx, incr, nstr: LongWord;
begin
+ if AHash = $FFFFFFFF then
+ begin
+ Result := '';
+ exit;
+ end;
idx := AHash mod HashTableSize;
incr := 1 + (AHash mod (HashTableSize - 2));
while True do
begin
nstr := HashTable^[idx];
- if nstr = 0 then
+ if (nstr = 0) or (nstr > StringCount) then
begin
Result := '';
exit;