From 5dc37b351085a7b8cdc30ef2ebb349c8e5df4e2c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@php.net>
Date: Mon, 4 Nov 2013 13:23:36 +0100
Subject: Sync ext/zip with pecl/zip version 1.3.2 - update libzip to version
 1.11.1. We don't use any private symbol anymore - new method
 ZipArchive::setPassword($password) - add --with-libzip option to build with
 system libzip

---
 ext/zip/lib/zip_error_clear.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'ext/zip/lib/zip_error_clear.c')

diff --git a/ext/zip/lib/zip_error_clear.c b/ext/zip/lib/zip_error_clear.c
index 34e7dea48e..b4ff103912 100644
--- a/ext/zip/lib/zip_error_clear.c
+++ b/ext/zip/lib/zip_error_clear.c
@@ -37,8 +37,11 @@
 
 
 
-ZIP_EXTERN(void)
+ZIP_EXTERN void
 zip_error_clear(struct zip *za)
 {
+    if (za == NULL)
+	return;
+
     _zip_error_clear(&za->error);
 }
-- 
cgit v1.2.1