cvs: php-src /ext/sqlite sqlite.c
| From: | Marcus Boerger | Date: | Thu, 26 Jun 2003 19:07:17 +0000 |
| Subject: | cvs: php-src /ext/sqlite sqlite.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-22054@lists.php.net to get a copy of this message | ||
helly Thu Jun 26 15:07:17 2003 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
Fix memleak
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.62 php-src/ext/sqlite/sqlite.c:1.63
--- php-src/ext/sqlite/sqlite.c:1.62 Wed Jun 25 19:21:10 2003
+++ php-src/ext/sqlite/sqlite.c Thu Jun 26 15:07:17 2003
@@ -17,7 +17,7 @@
| Marcus Boerger <helly@php.net> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.62 2003/06/25 23:21:10 helly Exp $
+ $Id: sqlite.c,v 1.63 2003/06/26 19:07:17 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -935,7 +935,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "SQLite support", "enabled");
- php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id:
sqlite.c,v 1.62 2003/06/25 23:21:10 helly Exp $");
+ php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id:
sqlite.c,v 1.63 2003/06/26 19:07:17 helly Exp $");
php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
php_info_print_table_end();
@@ -1030,6 +1030,9 @@
&filename, &filename_len, &mode, &errmsg)) {
return;
}
+ if (errmsg) {
+ zval_dtor(errmsg);
+ }
if (strncmp(filename, ":memory:", sizeof(":memory:") - 1)) {
/* resolve the fully-qualified path name to use as the hash key */
@@ -1095,6 +1098,9 @@
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
return;
}
+ if (errmsg) {
+ zval_dtor(errmsg);
+ }
if (strncmp(filename, ":memory:", sizeof(":memory:") - 1)) {
if (PG(safe_mode) && (!php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
@@ -1136,6 +1142,9 @@
&filename, &filename_len, &mode, &errmsg)) {
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
RETURN_NULL();
+ }
+ if (errmsg) {
+ zval_dtor(errmsg);
}
if (PG(safe_mode) && (!php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {