From cd7a01c34fc4304ef8161ee617568f274ace5d24 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Sun, 18 Mar 2018 23:13:40 +0100
Subject: Windows: Update libzip to version 1.5.0 that include fixes for some
 security issues.

---
 src/Common/libzip/zip_error_strerror.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'src/Common/libzip/zip_error_strerror.c')

diff --git a/src/Common/libzip/zip_error_strerror.c b/src/Common/libzip/zip_error_strerror.c
index bdc1e44c..6baf900f 100644
--- a/src/Common/libzip/zip_error_strerror.c
+++ b/src/Common/libzip/zip_error_strerror.c
@@ -17,7 +17,7 @@
   3. The names of the authors may not be used to endorse or promote
      products derived from this software without specific prior
      written permission.
- 
+
   THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
   OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -40,8 +40,7 @@
 
 
 ZIP_EXTERN const char *
-zip_error_strerror(zip_error_t *err)
-{
+zip_error_strerror(zip_error_t *err) {
     const char *zs, *ss;
     char buf[128], *s;
 
@@ -54,7 +53,7 @@ zip_error_strerror(zip_error_t *err)
     }
     else {
 	zs = _zip_err_str[err->zip_err];
-	
+
 	switch (_zip_err_type[err->zip_err]) {
 	case ZIP_ET_SYS:
 	    ss = strerror(err->sys_err);
@@ -72,14 +71,10 @@ zip_error_strerror(zip_error_t *err)
     if (ss == NULL)
 	return zs;
     else {
-	if ((s=(char *)malloc(strlen(ss)
-			      + (zs ? strlen(zs)+2 : 0) + 1)) == NULL)
+	if ((s = (char *)malloc(strlen(ss) + (zs ? strlen(zs) + 2 : 0) + 1)) == NULL)
 	    return _zip_err_str[ZIP_ER_MEMORY];
-	
-	sprintf(s, "%s%s%s",
-		(zs ? zs : ""),
-		(zs ? ": " : ""),
-		ss);
+
+	sprintf(s, "%s%s%s", (zs ? zs : ""), (zs ? ": " : ""), ss);
 	err->str = s;
 
 	return s;
-- 
cgit v1.2.3