1 files changed, 68 insertions, 25 deletions

diff --git a/ext/zip/lib/zip_set_name.c b/ext/zip/lib/zip_set_name.c
index 5a10381753..2a461437e2 100644
--- a/ext/zip/lib/zip_set_name.c
+++ b/ext/zip/lib/zip_set_name.c
@@ -1,6 +1,6 @@
 /*
   zip_set_name.c -- rename helper function
-  Copyright (C) 1999-2014 Dieter Baron and Thomas Klausner
+  Copyright (C) 1999-2015 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>
@@ -43,8 +43,10 @@ _zip_set_name(zip_t *za, zip_uint64_t idx, const char *name, zip_flags_t flags)
 {
     zip_entry_t *e;
     zip_string_t *str;
-    int changed;
+    bool same_as_orig;
     zip_int64_t i;
+    const zip_uint8_t *old_name, *new_name;
+    zip_string_t *old_str;
 
     if (idx >= za->nentry) {
 	zip_error_set(&za->error, ZIP_ER_INVAL, 0);
@@ -56,7 +58,7 @@ _zip_set_name(zip_t *za, zip_uint64_t idx, const char *name, zip_flags_t flags)
 	return -1;
     }
 
-    if (name && strlen(name) > 0) {
+    if (name && name[0] != '\0') {
         /* TODO: check for string too long */
 	if ((str=_zip_string_new((const zip_uint8_t *)name, (zip_uint16_t)strlen(name), flags, &za->error)) == NULL)
 	    return -1;
@@ -81,34 +83,75 @@ _zip_set_name(zip_t *za, zip_uint64_t idx, const char *name, zip_flags_t flags)
 
     e = za->entry+idx;
 
-    if (e->changes) {
-	_zip_string_free(e->changes->filename);
-	e->changes->filename = NULL;
-	e->changes->changed &= ~ZIP_DIRENT_FILENAME;
-    }
-
     if (e->orig)
-	changed = !_zip_string_equal(e->orig->filename, str);
+	same_as_orig = _zip_string_equal(e->orig->filename, str);
     else
-	changed = 1;
-	
-    if (changed) {
-        if (e->changes == NULL) {
-            if ((e->changes=_zip_dirent_clone(e->orig)) == NULL) {
-                zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
-		_zip_string_free(str);
-                return -1;
-            }
-        }
-        e->changes->filename = str;
-        e->changes->changed |= ZIP_DIRENT_FILENAME;
+	same_as_orig = false;
+
+    if (!same_as_orig && e->changes == NULL) {
+	if ((e->changes=_zip_dirent_clone(e->orig)) == NULL) {
+	    zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
+	    _zip_string_free(str);
+	    return -1;
+	}
+    }
+
+    if ((new_name = _zip_string_get(same_as_orig ? e->orig->filename : str, NULL, 0, &za->error)) == NULL) {
+	_zip_string_free(str);
+	return -1;
+    }
+
+    if (e->changes) {
+	old_str = e->changes->filename;
+    }
+    else if (e->orig) {
+	old_str = e->orig->filename;
     }
     else {
+	old_str = NULL;
+    }
+    
+    if (old_str) {
+	if ((old_name = _zip_string_get(old_str, NULL, 0, &za->error)) == NULL) {
+	    _zip_string_free(str);
+	    return -1;
+	}
+    }
+    else {
+	old_name = NULL;
+    }
+
+    if (_zip_hash_add(za->names, new_name, idx, 0, &za->error) == false) {
+	_zip_string_free(str);
+	return -1;
+    }
+    if (old_name) {
+	_zip_hash_delete(za->names, old_name, NULL);
+    }
+
+    if (same_as_orig) {
+	if (e->changes) {
+	    if (e->changes->changed & ZIP_DIRENT_FILENAME) {
+		_zip_string_free(e->changes->filename);
+		e->changes->changed &= ~ZIP_DIRENT_FILENAME;
+		if (e->changes->changed == 0) {
+		    _zip_dirent_free(e->changes);
+		    e->changes = NULL;
+		}
+		else {
+		    /* TODO: what if not cloned? can that happen? */
+		    e->changes->filename = e->orig->filename;
+		}
+	    }
+	}
 	_zip_string_free(str);
-	if (e->changes && e->changes->changed == 0) {
-	    _zip_dirent_free(e->changes);
-	    e->changes = NULL;
+    }
+    else {
+	if (e->changes->changed & ZIP_DIRENT_FILENAME) {
+	    _zip_string_free(e->changes->filename);
 	}
+	e->changes->changed |= ZIP_DIRENT_FILENAME;
+	e->changes->filename = str;
     }
 
     return 0;