Skip to content

Commit d33fecd

Browse files
committed
MFH
- Fixed bug #48185 removing no-op code
1 parent bb31072 commit d33fecd

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

NEWS

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ PHP NEWS
3333
- Added ability to throw exceptions from SQLite3 instead of warnings. (Scott)
3434
- Added startup notices for deprecated ini settings. (Kalle)
3535

36+
- Fixed bug #48185 (warning: value computed is not used in
37+
pdo_sqlite_stmt_get_col line 271). (Matteo)
3638
- Fixed bug #48087 (call_user_method() invalid free of arguments). (Felipe)
3739
- Fixed bug #48060 (pdo_pgsql - large objects are returned as empty). (Matteo)
3840
- Fixed bug #48034 (PHP crashes when script is 8192 (8KB) bytes long). (Dmitry)

ext/pdo_sqlite/sqlite_statement.c

-5
Original file line numberDiff line numberDiff line change
@@ -265,11 +265,6 @@ static int pdo_sqlite_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, unsi
265265
case SQLITE3_TEXT:
266266
*ptr = (char*)sqlite3_column_text(S->stmt, colno);
267267
*len = sqlite3_column_bytes(S->stmt, colno);
268-
if (*len) {
269-
/* sqlite3.h says "the NUL terminator is included in the byte count
270-
* for TEXT values" */
271-
*len--;
272-
}
273268
return 1;
274269

275270
default:

0 commit comments

Comments
 (0)