Fixed bug 29395 (sqlite_escape_string() returns bogus data on empty

strings).

Original Patch by: Tony

diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c
index 5e6c228ee918d748b9af735d64f6d1fc7296006c..fee732b0a61fefbea50e24dcd4e93938e08ec884 100644 (file)
--- a/ext/sqlite/sqlite.c
+++ b/ext/sqlite/sqlite.c
@@ -2680,12 +2680,14 @@ PHP_FUNCTION(sqlite_escape_string)
                enclen = php_sqlite_encode_binary(string, stringlen, ret+1);
                RETVAL_STRINGL(ret, enclen+1, 0);
                
-       } else  {
+       } else if (stringlen) {
                ret = sqlite_mprintf("%q", string);
                if (ret) {
                        RETVAL_STRING(ret, 1);
                        sqlite_freemem(ret);
                }
+       } else {
+               RETURN_EMPTY_STRING();
        }
 }
 /* }}} */