MFH

- Fixed bug #48185 removing no-op code

diff --git a/NEWS b/NEWS
index ed0e8778771555874c993956a76709a23ea4c64b..c9e4a4cd365ea28b1e5671d2ab60137d1dbb2cbe 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 933bb107a20ac30e41a1f3d57c8738eb6391f5fc..ea94eb29b248847fa599c9f6f7634e00c7e98c1e 100644 (file)
--- 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: