From 5c1b52a8e73092e036b82b3edbb96088175d2005 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Tue, 27 Jul 2004 16:53:48 +0000 Subject: [PATCH] MFH: Fixed bug 29395 (sqlite_escape_string() returns bogus data on empty strings). --- ext/sqlite/sqlite.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c index 107207115c2fb..448eed5a51579 100644 --- a/ext/sqlite/sqlite.c +++ b/ext/sqlite/sqlite.c @@ -1795,12 +1795,14 @@ PHP_FUNCTION(sqlite_escape_string) enclen = sqlite_encode_binary((const unsigned char*)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_STRINGL(empty_string, 0, 1); } } /* }}} */