diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index d5f7b019eb9ea..f8e00650e6b65 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -1004,6 +1004,21 @@ static void php_zip_cancel_callback_free(void *ptr)
 }
 #endif
 
+static void php_zip_object_dtor(zend_object *object)
+{
+	zend_objects_destroy_object(object);
+
+	ze_zip_object *intern = php_zip_fetch_object(object);
+
+	if (intern->za) {
+		if (zip_close(intern->za) != 0) {
+			php_error_docref(NULL, E_WARNING, "Cannot destroy the zip context: %s", zip_strerror(intern->za));
+			zip_discard(intern->za);
+		}
+		intern->za = NULL;
+	}
+}
+
 static void php_zip_object_free_storage(zend_object *object) /* {{{ */
 {
 	ze_zip_object * intern = php_zip_fetch_object(object);
@@ -2987,6 +3002,10 @@ PHP_METHOD(ZipArchive, getStream)
 #ifdef HAVE_PROGRESS_CALLBACK
 static void php_zip_progress_callback(zip_t *arch, double state, void *ptr)
 {
+	if (!EG(active)) {
+		return;
+	}
+
 	zval cb_args[1];
 	ze_zip_object *obj = ptr;
 
@@ -3033,6 +3052,10 @@ static int php_zip_cancel_callback(zip_t *arch, void *ptr)
 	zval cb_retval;
 	ze_zip_object *obj = ptr;
 
+	if (!EG(active)) {
+		return 0;
+	}
+
 	zend_call_known_fcc(&obj->cancel_callback, &cb_retval, 0, NULL, NULL);
 	if (Z_ISUNDEF(cb_retval)) {
 		/* Cancel if an exception has been thrown */
@@ -3120,6 +3143,7 @@ static PHP_MINIT_FUNCTION(zip)
 	memcpy(&zip_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
 	zip_object_handlers.offset = XtOffsetOf(ze_zip_object, zo);
 	zip_object_handlers.free_obj = php_zip_object_free_storage;
+	zip_object_handlers.dtor_obj = php_zip_object_dtor;
 	zip_object_handlers.clone_obj = NULL;
 	zip_object_handlers.get_property_ptr_ptr = php_zip_get_property_ptr_ptr;
 
diff --git a/ext/zip/tests/ZipArchive_bailout.phpt b/ext/zip/tests/ZipArchive_bailout.phpt
new file mode 100644
index 0000000000000..c7e4ede8446df
--- /dev/null
+++ b/ext/zip/tests/ZipArchive_bailout.phpt
@@ -0,0 +1,28 @@
+--TEST--
+ZipArchive destructor should be called on bailout
+--EXTENSIONS--
+zip
+--FILE--
+<?php
+
+function &cb() {}
+
+$file = __DIR__ . '/gh18907.zip';
+$zip = new ZipArchive;
+$zip->open($file, ZIPARCHIVE::CREATE);
+$zip->registerCancelCallback(cb(...));
+$zip->addFromString('test', 'test');
+$fusion = $zip;
+
+?>
+--CLEAN--
+<?php
+$file = __DIR__ . '/gh18907.zip';
+@unlink($file);
+?>
+--EXPECTF--
+Notice: Only variable references should be returned by reference in %s on line %d
+
+Notice: Only variable references should be returned by reference in %s on line %d
+
+Notice: Only variable references should be returned by reference in %s on line %d
diff --git a/ext/zip/tests/ZipArchive_destruct.phpt b/ext/zip/tests/ZipArchive_destruct.phpt
new file mode 100644
index 0000000000000..7e3ef6c5dae42
--- /dev/null
+++ b/ext/zip/tests/ZipArchive_destruct.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Leaking ZipArchive destructor
+--EXTENSIONS--
+zip
+--FILE--
+<?php
+
+class MyZipArchive extends ZipArchive {
+    public function __destruct() {
+        global $leak;
+        $leak = $this;
+    }
+}
+
+new MyZipArchive;
+$file = __DIR__ . '/ZipArchive_destruct.zip';
+$leak->open($file, ZIPARCHIVE::CREATE);
+$leak->addFromString('test', 'test');
+
+?>
+===DONE===
+--CLEAN--
+<?php
+$file = __DIR__ . '/ZipArchive_destruct.zip';
+@unlink($file);
+?>
+--EXPECT--
+===DONE===