summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2004-07-27 16:53:48 +0000
committerIlia Alshanetsky <iliaa@php.net>2004-07-27 16:53:48 +0000
commit5c1b52a8e73092e036b82b3edbb96088175d2005 (patch)
treecd8ae7a5ab448b39bc6ae3f0acc422e6119f647c
parent0a925c90d40c4fa3d5f417071463277083499ae4 (diff)
downloadphp-git-5c1b52a8e73092e036b82b3edbb96088175d2005.tar.gz
MFH: Fixed bug 29395 (sqlite_escape_string() returns bogus data on empty
strings).
-rw-r--r--ext/sqlite/sqlite.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c
index 107207115c..448eed5a51 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);
}
}
/* }}} */