From 04d7804aec1901a9421103a585d10b568041404a Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Sun, 7 Aug 2011 23:46:00 +0000 Subject: [PATCH] Fixes for variety of issues identified by coverity scan --- ext/pdo/pdo.c | 2 +- ext/pdo/pdo_dbh.c | 2 +- ext/pdo/pdo_sql_parser.re | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c index 169ce32e25..b654fea639 100755 --- a/ext/pdo/pdo.c +++ b/ext/pdo/pdo.c @@ -191,7 +191,7 @@ PDO_API int php_pdo_register_driver(pdo_driver_t *driver) } return zend_hash_add(&pdo_driver_hash, (char*)driver->driver_name, driver->driver_name_len, - (void**)&driver, sizeof(driver), NULL); + (void**)&driver, sizeof(pdo_driver_t *), NULL); } PDO_API void php_pdo_unregister_driver(pdo_driver_t *driver) diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c index 9cc4162f7f..c4380d1e48 100755 --- a/ext/pdo/pdo_dbh.c +++ b/ext/pdo/pdo_dbh.c @@ -57,7 +57,7 @@ void pdo_raise_impl_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *sqlstate pdo_err = &stmt->error_code; } - strcpy(*pdo_err, sqlstate); + strncpy(*pdo_err, sqlstate, 6); /* hash sqlstate to error messages */ msg = pdo_sqlstate_state_to_description(*pdo_err); diff --git a/ext/pdo/pdo_sql_parser.re b/ext/pdo/pdo_sql_parser.re index bb7af3575d..92411f8075 100644 --- a/ext/pdo/pdo_sql_parser.re +++ b/ext/pdo/pdo_sql_parser.re @@ -236,6 +236,9 @@ safe: plc->freeq = 0; break; + case IS_BOOL: + convert_to_long(param->parameter); + case IS_LONG: case IS_DOUBLE: convert_to_string(param->parameter); @@ -244,8 +247,6 @@ safe: plc->freeq = 0; break; - case IS_BOOL: - convert_to_long(param->parameter); default: convert_to_string(param->parameter); if (!stmt->dbh->methods->quoter(stmt->dbh, Z_STRVAL_P(param->parameter), -- 2.40.0