diff options
| author | Matteo Beccati <mbeccati@php.net> | 2009-05-07 23:29:54 +0000 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2009-05-07 23:29:54 +0000 |
| commit | d33fecdde8dc2befd37b371ef25be0f9c84328a5 (patch) | |
| tree | 71663187ea011c72b3a88d8e5aaca7e0941f2de3 | |
| parent | bb31072d3ee14bc2c280388243314163c1c65094 (diff) | |
| download | php-git-d33fecdde8dc2befd37b371ef25be0f9c84328a5.tar.gz | |
MFH
- Fixed bug #48185 removing no-op code
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/pdo_sqlite/sqlite_statement.c | 5 |
2 files changed, 2 insertions, 5 deletions
@@ -33,6 +33,8 @@ PHP NEWS - Added ability to throw exceptions from SQLite3 instead of warnings. (Scott) - Added startup notices for deprecated ini settings. (Kalle) +- Fixed bug #48185 (warning: value computed is not used in + pdo_sqlite_stmt_get_col line 271). (Matteo) - Fixed bug #48087 (call_user_method() invalid free of arguments). (Felipe) - Fixed bug #48060 (pdo_pgsql - large objects are returned as empty). (Matteo) - Fixed bug #48034 (PHP crashes when script is 8192 (8KB) bytes long). (Dmitry) diff --git a/ext/pdo_sqlite/sqlite_statement.c b/ext/pdo_sqlite/sqlite_statement.c index 933bb107a2..ea94eb29b2 100644 --- a/ext/pdo_sqlite/sqlite_statement.c +++ b/ext/pdo_sqlite/sqlite_statement.c @@ -265,11 +265,6 @@ static int pdo_sqlite_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, unsi case SQLITE3_TEXT: *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--; - } return 1; default: |