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_file_set_mtime.c | 56 +++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 28 deletions(-)

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

diff --git a/src/Common/libzip/zip_file_set_mtime.c b/src/Common/libzip/zip_file_set_mtime.c
index 0cdd31a6..15316d32 100644
--- a/src/Common/libzip/zip_file_set_mtime.c
+++ b/src/Common/libzip/zip_file_set_mtime.c
@@ -1,10 +1,10 @@
 /*
  zip_file_set_mtime.c -- set modification time of entry.
  Copyright (C) 2014 Dieter Baron and Thomas Klausner
- 
+
  This file is part of libzip, a library to manipulate ZIP archives.
  The authors can be contacted at <libzip@nih.at>
- 
+
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -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
@@ -33,42 +33,42 @@
 
 #include "zipint.h"
 
-ZIP_EXTERN int zip_file_set_mtime(zip_t *za, zip_uint64_t idx, time_t mtime, zip_flags_t flags)
-{
+ZIP_EXTERN int
+zip_file_set_mtime(zip_t *za, zip_uint64_t idx, time_t mtime, zip_flags_t flags) {
     zip_entry_t *e;
     int changed;
-    
+
     if (_zip_get_dirent(za, idx, 0, NULL) == NULL)
-        return -1;
-    
+	return -1;
+
     if (ZIP_IS_RDONLY(za)) {
-        zip_error_set(&za->error, ZIP_ER_RDONLY, 0);
-        return -1;
+	zip_error_set(&za->error, ZIP_ER_RDONLY, 0);
+	return -1;
     }
-    
-    e = za->entry+idx;
+
+    e = za->entry + idx;
 
     changed = e->orig == NULL || mtime != e->orig->last_mod;
-    
+
     if (changed) {
-        if (e->changes == NULL) {
-            if ((e->changes=_zip_dirent_clone(e->orig)) == NULL) {
-                zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
-                return -1;
-            }
-        }
-        e->changes->last_mod = mtime;
-        e->changes->changed |= ZIP_DIRENT_LAST_MOD;
+	if (e->changes == NULL) {
+	    if ((e->changes = _zip_dirent_clone(e->orig)) == NULL) {
+		zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
+		return -1;
+	    }
+	}
+	e->changes->last_mod = mtime;
+	e->changes->changed |= ZIP_DIRENT_LAST_MOD;
     }
     else {
-        if (e->changes) {
-            e->changes->changed &= ~ZIP_DIRENT_LAST_MOD;
-            if (e->changes->changed == 0) {
+	if (e->changes) {
+	    e->changes->changed &= ~ZIP_DIRENT_LAST_MOD;
+	    if (e->changes->changed == 0) {
 		_zip_dirent_free(e->changes);
-                e->changes = NULL;
-            }
-        }
+		e->changes = NULL;
+	    }
+	}
     }
-    
+
     return 0;
 }
-- 
cgit v1.2.3