svn: /php/php-src/ branches/PHP_5_3/ext/sqlite3/sqlite3.c branches/PHP_5_4/ext/sqlite3/sqlite3.c trunk/ext/sqlite3/sqlite3.c

iliaa Wed, 10 Aug 2011 15:30:07 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=314749 Log: Fixed memset usage (identified by coverity) Changed paths: U php/php-src/branches/PHP_5_3/ext/sqlite3/sqlite3.c U php/php-src/branches/PHP_5_4/ext/sqlite3/sqlite3.c U php/php-src/trunk/ext/sqlite3/sqlite3.c Modified: php/php-src/branches/PHP_5_3/ext/sqlite3/sqlite3.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/sqlite3/sqlite3.c 2011-08-10 14:56:59 UTC (rev 314748) +++ php/php-src/branches/PHP_5_3/ext/sqlite3/sqlite3.c 2011-08-10 15:30:07 UTC (rev 314749) @@ -2006,7 +2006,7 @@ /* Allocate memory for it */ intern = emalloc(sizeof(php_sqlite3_db_object)); - memset(&intern->zo, 0, sizeof(php_sqlite3_db_object)); + memset(intern, 0, sizeof(php_sqlite3_db_object)); intern->exception = 0; /* Need to keep track of things to free */ @@ -2030,7 +2030,7 @@ /* Allocate memory for it */ intern = emalloc(sizeof(php_sqlite3_stmt)); - memset(&intern->zo, 0, sizeof(php_sqlite3_stmt)); + memset(intern, 0, sizeof(php_sqlite3_stmt)); intern->db_obj_zval = NULL; @@ -2052,7 +2052,7 @@ /* Allocate memory for it */ intern = emalloc(sizeof(php_sqlite3_result)); - memset(&intern->zo, 0, sizeof(php_sqlite3_result)); + memset(intern, 0, sizeof(php_sqlite3_result)); intern->complete = 0; intern->is_prepared_statement = 0; Modified: php/php-src/branches/PHP_5_4/ext/sqlite3/sqlite3.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/sqlite3/sqlite3.c 2011-08-10 14:56:59 UTC (rev 314748) +++ php/php-src/branches/PHP_5_4/ext/sqlite3/sqlite3.c 2011-08-10 15:30:07 UTC (rev 314749) @@ -2002,7 +2002,7 @@ /* Allocate memory for it */ intern = emalloc(sizeof(php_sqlite3_db_object)); - memset(&intern->zo, 0, sizeof(php_sqlite3_db_object)); + memset(intern, 0, sizeof(php_sqlite3_db_object)); intern->exception = 0; /* Need to keep track of things to free */ @@ -2025,7 +2025,7 @@ /* Allocate memory for it */ intern = emalloc(sizeof(php_sqlite3_stmt)); - memset(&intern->zo, 0, sizeof(php_sqlite3_stmt)); + memset(intern, 0, sizeof(php_sqlite3_stmt)); intern->db_obj_zval = NULL; @@ -2046,7 +2046,7 @@ /* Allocate memory for it */ intern = emalloc(sizeof(php_sqlite3_result)); - memset(&intern->zo, 0, sizeof(php_sqlite3_result)); + memset(intern, 0, sizeof(php_sqlite3_result)); intern->complete = 0; intern->is_prepared_statement = 0; Modified: php/php-src/trunk/ext/sqlite3/sqlite3.c =================================================================== --- php/php-src/trunk/ext/sqlite3/sqlite3.c 2011-08-10 14:56:59 UTC (rev 314748) +++ php/php-src/trunk/ext/sqlite3/sqlite3.c 2011-08-10 15:30:07 UTC (rev 314749) @@ -2002,7 +2002,7 @@ /* Allocate memory for it */ intern = emalloc(sizeof(php_sqlite3_db_object)); - memset(&intern->zo, 0, sizeof(php_sqlite3_db_object)); + memset(intern, 0, sizeof(php_sqlite3_db_object)); intern->exception = 0; /* Need to keep track of things to free */ @@ -2025,7 +2025,7 @@ /* Allocate memory for it */ intern = emalloc(sizeof(php_sqlite3_stmt)); - memset(&intern->zo, 0, sizeof(php_sqlite3_stmt)); + memset(intern, 0, sizeof(php_sqlite3_stmt)); intern->db_obj_zval = NULL; @@ -2046,7 +2046,7 @@ /* Allocate memory for it */ intern = emalloc(sizeof(php_sqlite3_result)); - memset(&intern->zo, 0, sizeof(php_sqlite3_result)); + memset(intern, 0, sizeof(php_sqlite3_result)); intern->complete = 0; intern->is_prepared_statement = 0;