Segfault fixing!

2 files changed, 9 insertions, 5 deletions

diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c
index 3dd5211f5f..0a799a71a8 100644
--- a/ext/sqlite/sqlite.c
+++ b/ext/sqlite/sqlite.c
@@ -131,8 +131,7 @@ static void php_sqlite_function_callback(sqlite_func *func, int argc, const char
 		for (i = 0; i < argc-1; i++) {
 			zargs[i] = emalloc(sizeof(zval *));
 			MAKE_STD_ZVAL(*zargs[i]);
-
-			ZVAL_STRING(*zargs[i], (char*)argv[i+1], 0);
+			ZVAL_STRING(*zargs[i], (char*)argv[i+1], 1);
 		}
 	}
 
@@ -174,11 +173,14 @@ static void php_sqlite_function_callback(sqlite_func *func, int argc, const char
 
 	if (zargs) {
 		for (i = 0; i < argc-1; i++) {
+			zval_ptr_dtor(zargs[i]);
 			efree(zargs[i]);
 		}
 		efree(zargs);
 	}
 }
+
+
 PHP_MINIT_FUNCTION(sqlite)
 {
 	le_sqlite_db = zend_register_list_destructors_ex(php_sqlite_db_dtor, NULL, "sqlite database", module_number);
@@ -273,7 +275,7 @@ PHP_FUNCTION(sqlite_query)
 	long sql_len;
 	struct php_sqlite_result res, *rres;
 	int ret;
-	char *errtext;
+	char *errtext = NULL;
 
 	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sr", &sql, &sql_len, &zdb)) {
 		return;
diff --git a/ext/sqlite/sqlite.php b/ext/sqlite/sqlite.php
index ef17ae9b06..7b67cd3cfc 100644
--- a/ext/sqlite/sqlite.php
+++ b/ext/sqlite/sqlite.php
@@ -1,5 +1,7 @@
 <?php
-dl("sqlite.so");
+if (!extension_loaded("sqlite")) {
+	dl("sqlite.so");
+}
 
 debug_zval_dump(sqlite_libversion());
 debug_zval_dump(sqlite_libencoding());
@@ -9,7 +11,7 @@ $s = sqlite_open("weztest.sqlite", 0666, $err);
 debug_zval_dump($err);
 debug_zval_dump($s);
 
-//$r = sqlite_query("create table foo (a INTEGER PRIMARY KEY, b INTEGER )", $s);
+$r = sqlite_query("create table foo (a INTEGER PRIMARY KEY, b INTEGER )", $s);
 $r = sqlite_query("select *, php('md5', sql) as o from sqlite_master", $s);
 debug_zval_dump($r);
 debug_zval_dump(sqlite_num_rows($r));