Respect original memory limit (bug #3282091)

diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index 8301476981b13d683e66a10d62d80b2ff0584af5..a900b4495796720a3f3353a86056660080ceb046 100644 (file)
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -30,7 +30,7 @@ if (!$error && $_POST) {
        }
        if (is_string($query)) { // get_file() returns error as number, fread() as false
                if (function_exists('memory_get_usage')) {
-                       @ini_set("memory_limit", 2 * strlen($query) + memory_get_usage() + 8e6); // @ - may be disabled, 2 - substr and trim, 8e6 - other variables
+                       @ini_set("memory_limit", max(ini_get("memory_limit"), 2 * strlen($query) + memory_get_usage() + 8e6)); // @ - may be disabled, 2 - substr and trim, 8e6 - other variables
                }
                if ($query != "" && strlen($query) < 1e6) { // don't add big queries
                        $q = $query . (ereg(';$', $query) ? "" : ";"); //! doesn't work with DELIMITER |