diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2009-05-19 16:14:37 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2009-05-19 16:14:37 +0000 |
| commit | 1989085325294aefc791e52931aa9cb2db5d5062 (patch) | |
| tree | 08002398ba1d91534381200ebdac11d61f675541 /ext/pdo_sqlite/sqlite_statement.c | |
| parent | bb33de84b006b762455c6308385c49b0456ca65c (diff) | |
| download | php-git-1989085325294aefc791e52931aa9cb2db5d5062.tar.gz | |
MFB: Revert faulty warning fix
Diffstat (limited to 'ext/pdo_sqlite/sqlite_statement.c')
| -rw-r--r-- | ext/pdo_sqlite/sqlite_statement.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/pdo_sqlite/sqlite_statement.c b/ext/pdo_sqlite/sqlite_statement.c index 74e9686e9d..52e4b62bd6 100644 --- a/ext/pdo_sqlite/sqlite_statement.c +++ b/ext/pdo_sqlite/sqlite_statement.c @@ -244,6 +244,10 @@ 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 (*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 */ + } return 1; } } |