commit 6a542b23dc14fdff12c4e7df1563b8900ca3bb6e
author Dieter Baron <dillo@nih.at> Mon Jul 21 17:30:38 2008 +0200
committer Dieter Baron <dillo@nih.at> Mon Jul 21 17:30:38 2008 +0200
tree 313f29c8b262ff79672a1d712a141495fb9438ef
parent 0659af54e89640c3425d0478c70fe82b66da5cac

Don't allow renaming a file to a directory/ or vice versa, or a deleted file.

--HG--
branch : HEAD

lib/zip_rename.c

diff --git a/lib/zip_rename.c b/lib/zip_rename.c
index b7d1247..1d056bb 100644
--- a/lib/zip_rename.c
+++ b/lib/zip_rename.c
@@ -1,6 +1,6 @@
 /*
   zip_rename.c -- rename file in zip archive
-  Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
+  Copyright (C) 1999-2008 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>
@@ -33,6 +33,8 @@
 
 
 
+#include <string.h>
+
 #include "zipint.h"
 
 
@@ -40,7 +42,21 @@
 ZIP_EXTERN int
 zip_rename(struct zip *za, int idx, const char *name)
 {
-    if (idx >= za->nentry || idx < 0) {
+    const char *old_name;
+    int old_is_dir, new_is_dir;
+    
+    if (idx >= za->nentry || idx < 0 || name[0] == '\0') {
+	_zip_error_set(&za->error, ZIP_ER_INVAL, 0);
+	return -1;
+    }
+
+    if ((old_name=zip_get_name(za, idx, 0)) == NULL)
+	return -1;
+								    
+    new_is_dir = (name[strlen(name)-1] == '/');
+    old_is_dir = (old_name[strlen(old_name)-1] == '/');
+
+    if (new_is_dir != old_is_dir) {
 	_zip_error_set(&za->error, ZIP_ER_INVAL, 0);
 	return -1;
     }