From a607ee15a8fb3a1475d6193cc5251e8c43e88955 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Tue, 19 May 2009 19:20:01 +0000 Subject: [PATCH] MFB: The \0 removal is only needed prior to 3.4.0 --- ext/pdo_sqlite/sqlite_statement.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ext/pdo_sqlite/sqlite_statement.c b/ext/pdo_sqlite/sqlite_statement.c index 52e4b62bd6..8827f8b216 100644 --- a/ext/pdo_sqlite/sqlite_statement.c +++ b/ext/pdo_sqlite/sqlite_statement.c @@ -244,10 +244,12 @@ static int pdo_sqlite_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, unsi default: *ptr = (char*)sqlite3_column_text(S->stmt, colno); *len = sqlite3_column_bytes(S->stmt, colno); +#if SQLITE_VERSION_NUMBER < 3004000 if (*len) { /* sqlite3.h says "the NUL terminator is included in the byte count for TEXT values" */ - *len--; /* do not remove this, even though it generates a warning */ + (*len)--; } +#endif return 1; } } -- 2.50.1