Decrypt empty string

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1290 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/xxtea.inc.php b/adminer/include/xxtea.inc.php
index cea1badf65501ed2b389d961b1176e908d494a03..476b937b6bd1524a738bf16fdce753072f1e8530 100644 (file)
--- a/adminer/include/xxtea.inc.php
+++ b/adminer/include/xxtea.inc.php
@@ -43,6 +43,9 @@ function xxtea_mx($z, $y, $sum, $k) {
 * @return string binary cipher
 */
 function encrypt_string($str, $key) {
+       if ($str == "") {
+               return "";
+       }
        $v = str2long($str, true);
        $n = count($v) - 1;
        $z = $v[$n];
@@ -72,11 +75,11 @@ function encrypt_string($str, $key) {
 * @return string plain-text password
 */
 function decrypt_string($str, $key) {
-       $v = str2long($str, false);
-       $n = count($v) - 1;
-       if (!$n) {
+       if ($str == "") {
                return "";
        }
+       $v = str2long($str, false);
+       $n = count($v) - 1;
        $z = $v[$n];
        $y = $v[0];
        $q = floor(6 + 52 / ($n + 1));