2 files changed, 4 insertions, 2 deletions
diff --git a/rpminfo.c b/rpminfo.c
index ee6e0c6..c90be1e 100644
--- a/rpminfo.c
+++ b/rpminfo.c
@@ -234,7 +234,7 @@ PHP_FUNCTION(rpminfo)
 	}
 	if (error) {
 		ZVAL_DEREF(error);
-		zval_dtor(error);
+		zval_ptr_dtor_nogc(error);
 		ZVAL_NULL(error);
 	}
 	if (php_check_open_basedir(path)) {
diff --git a/tests/008-rpmdbsearch.phpt b/tests/008-rpmdbsearch.phpt
index 6e0e402..2bd04f1 100644
--- a/tests/008-rpmdbsearch.phpt
+++ b/tests/008-rpmdbsearch.phpt
@@ -2,7 +2,9 @@
 Check for rpmdbinfo function
 --SKIPIF--
 <?php
-if (!extension_loaded("rpminfo")) print "skip";
+if (!extension_loaded("rpminfo")) dir('skip extension missing');
+$a = rpmdbsearch(PHP_BINARY, RPMTAG_INSTFILENAMES);
+if (is_null($a)) die('skip PHP installed from sources');
 ?>
 
 --FILE--