diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-06-04 21:30:04 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-06-07 21:01:31 +0200 |
| commit | 335a11b14b35e261c484d44a0e1b5ea9cc758e19 (patch) | |
| tree | 515f54cede9e42804b4da1e1ef60d1d9f55bb633 /ext/zip/lib/zip_rename.c | |
| parent | 7cae4ff02c593ed212a363d65c83c38a67a27f0d (diff) | |
| download | php-git-335a11b14b35e261c484d44a0e1b5ea9cc758e19.tar.gz | |
initial libzip upgrade patch to 0.10.1
Diffstat (limited to 'ext/zip/lib/zip_rename.c')
| -rw-r--r-- | ext/zip/lib/zip_rename.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ext/zip/lib/zip_rename.c b/ext/zip/lib/zip_rename.c index e40ab27674..6b5a035917 100644 --- a/ext/zip/lib/zip_rename.c +++ b/ext/zip/lib/zip_rename.c @@ -40,16 +40,21 @@ ZIP_EXTERN(int) -zip_rename(struct zip *za, int idx, const char *name) +zip_rename(struct zip *za, zip_uint64_t idx, const char *name) { const char *old_name; int old_is_dir, new_is_dir; - if (idx >= za->nentry || idx < 0 || name[0] == '\0') { + if (idx >= za->nentry || name[0] == '\0') { _zip_error_set(&za->error, ZIP_ER_INVAL, 0); return -1; } + if (ZIP_IS_RDONLY(za)) { + _zip_error_set(&za->error, ZIP_ER_RDONLY, 0); + return -1; + } + if ((old_name=zip_get_name(za, idx, 0)) == NULL) return -1; |