diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 001d27d891..13fca9bd44 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,10 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-11-10 15:03 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/tests/cpinfo.prg
+    ! fixed possible infinite loop in character padding procedure
+
 2009-11-10 13:34 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/tests/cpinfo.prg
     + added additional information that binary tables generated by cpinfo.prg
diff --git a/harbour/tests/cpinfo.prg b/harbour/tests/cpinfo.prg
index 880f6e59bd..2055e0344c 100644
--- a/harbour/tests/cpinfo.prg
+++ b/harbour/tests/cpinfo.prg
@@ -204,7 +204,7 @@ static function pad_letters( cUp, cLo )
       if upper( cL ) == cU .and. lower( cU ) == cL
          ++i
          ++j
-      elseif cL == "" .or. !islower( lower( cU ) )
+      elseif cL == "" .or. ( ! cU == "" .and. !islower( lower( cU ) ) )
          cL := " "
          ++i
       elseif cU == "" .or. !isupper( upper( cL ) )