That's not a NOP code, it actually needed, the length is a pointer to an integer that is being modified.


Ilia Alshanetsky




On 7-May-09, at 7:04 PM, Matteo Beccati wrote:

mbeccati                Thu May  7 23:04:02 2009 UTC

 Modified files:
   /php-src/ext/pdo_sqlite      sqlite_statement.c
 Log:
 - Fixed bug #48185 removing no-op code


http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.31&r2=1.32&diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite_statement.c
diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.31 php-src/ext/ pdo_sqlite/sqlite_statement.c:1.32 --- php-src/ext/pdo_sqlite/sqlite_statement.c:1.31 Wed Apr 1 14:34:21 2009
+++ php-src/ext/pdo_sqlite/sqlite_statement.c   Thu May  7 23:04:02 2009
@@ -16,7 +16,7 @@
+ ----------------------------------------------------------------------+
*/

-/* $Id: sqlite_statement.c,v 1.31 2009/04/01 14:34:21 indeyets Exp $ */ +/* $Id: sqlite_statement.c,v 1.32 2009/05/07 23:04:02 mbeccati Exp $ */

#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -265,11 +265,6 @@
                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:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to