summaryrefslogtreecommitdiff
path: root/ext/pdo_sqlite/sqlite_driver.c
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2008-12-02 21:00:23 +0000
committerFelipe Pena <felipe@php.net>2008-12-02 21:00:23 +0000
commitfbf7cc72aa4a3bb01abdcadab80d4fefec33a088 (patch)
treee7c341f21f07539c9b9b793ca4c05579ed533926 /ext/pdo_sqlite/sqlite_driver.c
parent61f0a0ddd4e151be7846f8471fecdae98fd29134 (diff)
downloadphp-git-fbf7cc72aa4a3bb01abdcadab80d4fefec33a088.tar.gz
- Fixed memory leaks
- Added new tests (Coverage++)
Diffstat (limited to 'ext/pdo_sqlite/sqlite_driver.c')
-rw-r--r--ext/pdo_sqlite/sqlite_driver.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c
index fbc6bca3cf..e5858b7453 100644
--- a/ext/pdo_sqlite/sqlite_driver.c
+++ b/ext/pdo_sqlite/sqlite_driver.c
@@ -392,8 +392,8 @@ static int do_callback(struct pdo_sqlite_fci *fc, zval *cb,
}
/* clean up the params */
- if (argc) {
- for (i = is_agg; i < argc; i++) {
+ if (zargs) {
+ for (i = is_agg; i < fake_argc; i++) {
zval_ptr_dtor(zargs[i]);
efree(zargs[i]);
}
@@ -519,6 +519,7 @@ static PHP_METHOD(SQLite, sqliteCreateFunction)
MAKE_STD_ZVAL(func->func);
*(func->func) = *callback;
zval_copy_ctor(func->func);
+ INIT_PZVAL(func->func);
func->argc = argc;
@@ -592,10 +593,12 @@ static PHP_METHOD(SQLite, sqliteCreateAggregate)
MAKE_STD_ZVAL(func->step);
*(func->step) = *step_callback;
zval_copy_ctor(func->step);
+ INIT_PZVAL(func->step);
MAKE_STD_ZVAL(func->fini);
*(func->fini) = *fini_callback;
zval_copy_ctor(func->fini);
+ INIT_PZVAL(func->fini);
func->argc = argc;