diff options
| author | Ondřej Surý <ondrej@sury.org> | 2011-08-19 10:22:38 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2011-08-19 10:22:38 +0200 |
| commit | f452a2b3e4e4279b27594a8ddb66525442d59227 (patch) | |
| tree | d05cb62c5515ada33076d3cc3e49b664733a478c /ext/pdo_sqlite/sqlite_driver.c | |
| parent | 038ba12e8724d537040e88ec794354b0c063f0a6 (diff) | |
| download | php-upstream/5.3.7.tar.gz | |
Imported Upstream version 5.3.7upstream/5.3.7
Diffstat (limited to 'ext/pdo_sqlite/sqlite_driver.c')
| -rw-r--r-- | ext/pdo_sqlite/sqlite_driver.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c index 8a731fc93..2eb78fc63 100644 --- a/ext/pdo_sqlite/sqlite_driver.c +++ b/ext/pdo_sqlite/sqlite_driver.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sqlite_driver.c 306939 2011-01-01 02:19:59Z felipe $ */ +/* $Id: sqlite_driver.c 314451 2011-08-08 00:07:54Z iliaa $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -47,33 +47,33 @@ int _pdo_sqlite_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *file, int li } einfo->errmsg = pestrdup((char*)sqlite3_errmsg(H->db), dbh->is_persistent); } else { /* no error */ - strcpy(*pdo_err, PDO_ERR_NONE); + strncpy(*pdo_err, PDO_ERR_NONE, sizeof(PDO_ERR_NONE)); return 0; } switch (einfo->errcode) { case SQLITE_NOTFOUND: - strcpy(*pdo_err, "42S02"); + strncpy(*pdo_err, "42S02", sizeof("42S02")); break; case SQLITE_INTERRUPT: - strcpy(*pdo_err, "01002"); + strncpy(*pdo_err, "01002", sizeof("01002")); break; case SQLITE_NOLFS: - strcpy(*pdo_err, "HYC00"); + strncpy(*pdo_err, "HYC00", sizeof("HYC00")); break; case SQLITE_TOOBIG: - strcpy(*pdo_err, "22001"); + strncpy(*pdo_err, "22001", sizeof("22001")); break; case SQLITE_CONSTRAINT: - strcpy(*pdo_err, "23000"); + strncpy(*pdo_err, "23000", sizeof("23000")); break; case SQLITE_ERROR: default: - strcpy(*pdo_err, "HY000"); + strncpy(*pdo_err, "HY000", sizeof("HY000")); break; } @@ -593,7 +593,7 @@ static PHP_METHOD(SQLite, sqliteCreateAggregate) static const zend_function_entry dbh_methods[] = { PHP_ME(SQLite, sqliteCreateFunction, NULL, ZEND_ACC_PUBLIC) PHP_ME(SQLite, sqliteCreateAggregate, NULL, ZEND_ACC_PUBLIC) - {NULL, NULL, NULL} + PHP_FE_END }; static const zend_function_entry *get_driver_methods(pdo_dbh_t *dbh, int kind TSRMLS_DC) |