annotate modules/zip/libzip/lib/zip_open.c @ 527:8f8c32f102f1

Zip: resurrection
author David Demelier <markand@malikania.fr>
date Wed, 01 Jun 2016 17:36:52 +0200
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
527
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
1 /*
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
2 zip_open.c -- open zip archive by name
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
3 Copyright (C) 1999-2015 Dieter Baron and Thomas Klausner
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
4
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
5 This file is part of libzip, a library to manipulate ZIP archives.
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
6 The authors can be contacted at <libzip@nih.at>
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
7
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
8 Redistribution and use in source and binary forms, with or without
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
9 modification, are permitted provided that the following conditions
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
10 are met:
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
11 1. Redistributions of source code must retain the above copyright
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
12 notice, this list of conditions and the following disclaimer.
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
13 2. Redistributions in binary form must reproduce the above copyright
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
14 notice, this list of conditions and the following disclaimer in
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
15 the documentation and/or other materials provided with the
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
16 distribution.
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
17 3. The names of the authors may not be used to endorse or promote
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
18 products derived from this software without specific prior
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
19 written permission.
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
20
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
21 THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
22 OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
23 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
24 ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
25 DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
26 DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
27 GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
28 INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
29 IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
30 OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
31 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
32 */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
33
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
34
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
35 #include <sys/stat.h>
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
36 #include <limits.h>
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
37 #include <stdio.h>
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
38 #include <stdlib.h>
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
39 #include <string.h>
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
40
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
41 #include "zipint.h"
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
42
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
43 typedef enum {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
44 EXISTS_ERROR = -1,
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
45 EXISTS_NOT = 0,
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
46 EXISTS_EMPTY,
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
47 EXISTS_NONEMPTY,
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
48 } exists_t;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
49 static zip_t *_zip_allocate_new(zip_source_t *src, unsigned int flags, zip_error_t *error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
50 static zip_int64_t _zip_checkcons(zip_t *za, zip_cdir_t *cdir, zip_error_t *error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
51 static zip_cdir_t *_zip_find_central_dir(zip_t *za, zip_uint64_t len);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
52 static exists_t _zip_file_exists(zip_source_t *src, zip_error_t *error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
53 static int _zip_headercomp(const zip_dirent_t *, const zip_dirent_t *);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
54 static unsigned char *_zip_memmem(const unsigned char *, size_t, const unsigned char *, size_t);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
55 static zip_cdir_t *_zip_read_cdir(zip_t *za, zip_buffer_t *buffer, zip_uint64_t buf_offset, zip_error_t *error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
56 static zip_cdir_t *_zip_read_eocd(zip_buffer_t *buffer, zip_uint64_t buf_offset, unsigned int flags, zip_error_t *error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
57 static zip_cdir_t *_zip_read_eocd64(zip_source_t *src, zip_buffer_t *buffer, zip_uint64_t buf_offset, unsigned int flags, zip_error_t *error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
58
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
59
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
60 ZIP_EXTERN zip_t *
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
61 zip_open(const char *fn, int _flags, int *zep)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
62 {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
63 zip_t *za;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
64 zip_source_t *src;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
65 struct zip_error error;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
66
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
67 zip_error_init(&error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
68 if ((src = zip_source_file_create(fn, 0, -1, &error)) == NULL) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
69 _zip_set_open_error(zep, &error, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
70 zip_error_fini(&error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
71 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
72 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
73
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
74 if ((za = zip_open_from_source(src, _flags, &error)) == NULL) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
75 zip_source_free(src);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
76 _zip_set_open_error(zep, &error, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
77 zip_error_fini(&error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
78 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
79 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
80
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
81 zip_error_fini(&error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
82 return za;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
83 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
84
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
85
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
86 ZIP_EXTERN zip_t *
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
87 zip_open_from_source(zip_source_t *src, int _flags, zip_error_t *error)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
88 {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
89 static zip_int64_t needed_support_read = -1;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
90 static zip_int64_t needed_support_write = -1;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
91
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
92 unsigned int flags;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
93 zip_int64_t supported;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
94 exists_t exists;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
95
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
96 if (_flags < 0 || src == NULL) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
97 zip_error_set(error, ZIP_ER_INVAL, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
98 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
99 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
100 flags = (unsigned int)_flags;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
101
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
102 supported = zip_source_supports(src);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
103 if (needed_support_read == -1) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
104 needed_support_read = zip_source_make_command_bitmap(ZIP_SOURCE_OPEN, ZIP_SOURCE_READ, ZIP_SOURCE_CLOSE, ZIP_SOURCE_SEEK, ZIP_SOURCE_TELL, ZIP_SOURCE_STAT, -1);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
105 needed_support_write = zip_source_make_command_bitmap(ZIP_SOURCE_BEGIN_WRITE, ZIP_SOURCE_COMMIT_WRITE, ZIP_SOURCE_ROLLBACK_WRITE, ZIP_SOURCE_SEEK_WRITE, ZIP_SOURCE_TELL_WRITE, ZIP_SOURCE_REMOVE, -1);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
106 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
107 if ((supported & needed_support_read) != needed_support_read) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
108 zip_error_set(error, ZIP_ER_OPNOTSUPP, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
109 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
110 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
111 if ((supported & needed_support_write) != needed_support_write) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
112 flags |= ZIP_RDONLY;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
113 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
114
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
115 if ((flags & (ZIP_RDONLY|ZIP_TRUNCATE)) == (ZIP_RDONLY|ZIP_TRUNCATE)) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
116 zip_error_set(error, ZIP_ER_RDONLY, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
117 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
118 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
119
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
120 exists = _zip_file_exists(src, error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
121 switch (exists) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
122 case EXISTS_ERROR:
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
123 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
124
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
125 case EXISTS_NOT:
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
126 if ((flags & ZIP_CREATE) == 0) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
127 zip_error_set(error, ZIP_ER_NOENT, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
128 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
129 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
130 return _zip_allocate_new(src, flags, error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
131
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
132 default: {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
133 zip_t *za;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
134 if (flags & ZIP_EXCL) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
135 zip_error_set(error, ZIP_ER_EXISTS, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
136 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
137 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
138 if (zip_source_open(src) < 0) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
139 _zip_error_set_from_source(error, src);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
140 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
141 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
142
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
143 if (flags & ZIP_TRUNCATE) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
144 za = _zip_allocate_new(src, flags, error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
145 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
146 else {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
147 /* ZIP_CREATE gets ignored if file exists and not ZIP_EXCL, just like open() */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
148 za = _zip_open(src, flags, error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
149 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
150
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
151 if (za == NULL) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
152 zip_source_close(src);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
153 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
154 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
155 return za;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
156 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
157 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
158 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
159
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
160 ZIP_EXTERN int
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
161 zip_archive_set_tempdir(zip_t *za, const char *tempdir)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
162 {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
163 char *new_tempdir;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
164
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
165 if (tempdir) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
166 if ((new_tempdir = strdup(tempdir)) == NULL) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
167 zip_error_set(&za->error, ZIP_ER_MEMORY, errno);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
168 return -1;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
169 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
170 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
171 else
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
172 new_tempdir = NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
173
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
174 free(za->tempdir);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
175 za->tempdir = new_tempdir;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
176
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
177 return 0;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
178 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
179
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
180 zip_t *
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
181 _zip_open(zip_source_t *src, unsigned int flags, zip_error_t *error)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
182 {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
183 zip_t *za;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
184 zip_cdir_t *cdir;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
185 struct zip_stat st;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
186 zip_uint64_t len, idx;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
187
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
188 zip_stat_init(&st);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
189 if (zip_source_stat(src, &st) < 0) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
190 _zip_error_set_from_source(error, src);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
191 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
192 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
193 if ((st.valid & ZIP_STAT_SIZE) == 0) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
194 zip_error_set(error, ZIP_ER_SEEK, EOPNOTSUPP);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
195 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
196 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
197 len = st.size;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
198
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
199 /* treat empty files as empty archives */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
200 if (len == 0) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
201 if ((za=_zip_allocate_new(src, flags, error)) == NULL) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
202 zip_source_free(src);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
203 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
204 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
205
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
206 return za;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
207 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
208
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
209 if ((za=_zip_allocate_new(src, flags, error)) == NULL) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
210 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
211 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
212
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
213 if ((cdir = _zip_find_central_dir(za, len)) == NULL) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
214 _zip_error_copy(error, &za->error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
215 /* keep src so discard does not get rid of it */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
216 zip_source_keep(src);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
217 zip_discard(za);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
218 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
219 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
220
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
221 za->entry = cdir->entry;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
222 za->nentry = cdir->nentry;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
223 za->nentry_alloc = cdir->nentry_alloc;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
224 za->comment_orig = cdir->comment;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
225
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
226 free(cdir);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
227
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
228 for (idx = 0; idx < za->nentry; idx++) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
229 const zip_uint8_t *name = _zip_string_get(za->entry[idx].orig->filename, NULL, 0, error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
230 if (name == NULL) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
231 /* keep src so discard does not get rid of it */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
232 zip_source_keep(src);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
233 zip_discard(za);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
234 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
235 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
236
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
237 if (_zip_hash_add(za->names, name, idx, ZIP_FL_UNCHANGED, &za->error) == false) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
238 if (za->error.zip_err != ZIP_ER_EXISTS || (flags & ZIP_CHECKCONS)) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
239 _zip_error_copy(error, &za->error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
240 /* keep src so discard does not get rid of it */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
241 zip_source_keep(src);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
242 zip_discard(za);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
243 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
244 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
245 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
246 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
247
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
248 za->ch_flags = za->flags;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
249
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
250 return za;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
251 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
252
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
253
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
254 void
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
255 _zip_set_open_error(int *zep, const zip_error_t *err, int ze)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
256 {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
257 if (err) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
258 ze = zip_error_code_zip(err);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
259 if (zip_error_system_type(err) == ZIP_ET_SYS) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
260 errno = zip_error_code_system(err);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
261 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
262 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
263
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
264 if (zep)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
265 *zep = ze;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
266 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
267
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
268
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
269 /* _zip_readcdir:
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
270 tries to find a valid end-of-central-directory at the beginning of
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
271 buf, and then the corresponding central directory entries.
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
272 Returns a struct zip_cdir which contains the central directory
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
273 entries, or NULL if unsuccessful. */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
274
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
275 static zip_cdir_t *
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
276 _zip_read_cdir(zip_t *za, zip_buffer_t *buffer, zip_uint64_t buf_offset, zip_error_t *error)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
277 {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
278 zip_cdir_t *cd;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
279 zip_uint16_t comment_len;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
280 zip_uint64_t i, left;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
281 zip_uint64_t eocd_offset = _zip_buffer_offset(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
282 zip_buffer_t *cd_buffer;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
283
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
284 if (_zip_buffer_left(buffer) < EOCDLEN) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
285 /* not enough bytes left for comment */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
286 zip_error_set(error, ZIP_ER_NOZIP, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
287 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
288 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
289
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
290 /* check for end-of-central-dir magic */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
291 if (memcmp(_zip_buffer_get(buffer, 4), EOCD_MAGIC, 4) != 0) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
292 zip_error_set(error, ZIP_ER_NOZIP, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
293 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
294 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
295
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
296 if (eocd_offset >= EOCD64LOCLEN && memcmp(_zip_buffer_data(buffer) + eocd_offset - EOCD64LOCLEN, EOCD64LOC_MAGIC, 4) == 0) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
297 _zip_buffer_set_offset(buffer, eocd_offset - EOCD64LOCLEN);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
298 cd = _zip_read_eocd64(za->src, buffer, buf_offset, za->flags, error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
299 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
300 else {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
301 _zip_buffer_set_offset(buffer, eocd_offset);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
302 cd = _zip_read_eocd(buffer, buf_offset, za->flags, error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
303 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
304
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
305 if (cd == NULL)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
306 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
307
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
308 _zip_buffer_set_offset(buffer, eocd_offset + 20);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
309 comment_len = _zip_buffer_get_16(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
310
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
311 if (cd->offset + cd->size > buf_offset + eocd_offset) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
312 /* cdir spans past EOCD record */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
313 zip_error_set(error, ZIP_ER_INCONS, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
314 _zip_cdir_free(cd);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
315 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
316 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
317
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
318 if (comment_len || (za->open_flags & ZIP_CHECKCONS)) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
319 zip_uint64_t tail_len;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
320
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
321 _zip_buffer_set_offset(buffer, eocd_offset + EOCDLEN);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
322 tail_len = _zip_buffer_left(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
323
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
324 if (tail_len < comment_len || ((za->open_flags & ZIP_CHECKCONS) && tail_len != comment_len)) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
325 zip_error_set(error, ZIP_ER_INCONS, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
326 _zip_cdir_free(cd);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
327 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
328 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
329
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
330 if (comment_len) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
331 if ((cd->comment=_zip_string_new(_zip_buffer_get(buffer, comment_len), comment_len, ZIP_FL_ENC_GUESS, error)) == NULL) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
332 _zip_cdir_free(cd);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
333 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
334 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
335 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
336 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
337
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
338 if (cd->offset >= buf_offset) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
339 zip_uint8_t *data;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
340 /* if buffer already read in, use it */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
341 _zip_buffer_set_offset(buffer, cd->offset - buf_offset);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
342
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
343 if ((data = _zip_buffer_get(buffer, cd->size)) == NULL) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
344 zip_error_set(error, ZIP_ER_INCONS, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
345 _zip_cdir_free(cd);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
346 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
347 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
348 if ((cd_buffer = _zip_buffer_new(data, cd->size)) == NULL) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
349 zip_error_set(error, ZIP_ER_MEMORY, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
350 _zip_cdir_free(cd);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
351 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
352 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
353 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
354 else {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
355 cd_buffer = NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
356
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
357 if (zip_source_seek(za->src, (zip_int64_t)cd->offset, SEEK_SET) < 0) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
358 _zip_error_set_from_source(error, za->src);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
359 _zip_cdir_free(cd);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
360 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
361 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
362
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
363 /* possible consistency check: cd->offset = len-(cd->size+cd->comment_len+EOCDLEN) ? */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
364 if (zip_source_tell(za->src) != (zip_int64_t)cd->offset) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
365 zip_error_set(error, ZIP_ER_NOZIP, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
366 _zip_cdir_free(cd);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
367 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
368 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
369 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
370
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
371 left = (zip_uint64_t)cd->size;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
372 i=0;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
373 while (i<cd->nentry && left > 0) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
374 zip_int64_t entry_size;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
375 if ((cd->entry[i].orig=_zip_dirent_new()) == NULL || (entry_size = _zip_dirent_read(cd->entry[i].orig, za->src, cd_buffer, false, error)) < 0) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
376 _zip_cdir_free(cd);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
377 _zip_buffer_free(cd_buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
378 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
379 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
380 i++;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
381 left -= (zip_uint64_t)entry_size;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
382 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
383
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
384 if (i != cd->nentry) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
385 zip_error_set(error, ZIP_ER_INCONS, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
386 _zip_buffer_free(cd_buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
387 _zip_cdir_free(cd);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
388 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
389 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
390
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
391 if (za->open_flags & ZIP_CHECKCONS) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
392 bool ok;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
393
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
394 if (cd_buffer) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
395 ok = _zip_buffer_eof(cd_buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
396 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
397 else {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
398 zip_int64_t offset = zip_source_tell(za->src);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
399
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
400 if (offset < 0) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
401 _zip_error_set_from_source(error, za->src);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
402 _zip_buffer_free(cd_buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
403 _zip_cdir_free(cd);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
404 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
405 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
406 ok = ((zip_uint64_t)offset == cd->offset + cd->size);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
407 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
408
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
409 if (!ok) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
410 zip_error_set(error, ZIP_ER_INCONS, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
411 _zip_buffer_free(cd_buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
412 _zip_cdir_free(cd);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
413 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
414 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
415 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
416
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
417 _zip_buffer_free(cd_buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
418 return cd;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
419 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
420
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
421
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
422 /* _zip_checkcons:
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
423 Checks the consistency of the central directory by comparing central
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
424 directory entries with local headers and checking for plausible
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
425 file and header offsets. Returns -1 if not plausible, else the
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
426 difference between the lowest and the highest fileposition reached */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
427
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
428 static zip_int64_t
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
429 _zip_checkcons(zip_t *za, zip_cdir_t *cd, zip_error_t *error)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
430 {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
431 zip_uint64_t i;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
432 zip_uint64_t min, max, j;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
433 struct zip_dirent temp;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
434
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
435 _zip_dirent_init(&temp);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
436 if (cd->nentry) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
437 max = cd->entry[0].orig->offset;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
438 min = cd->entry[0].orig->offset;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
439 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
440 else
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
441 min = max = 0;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
442
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
443 for (i=0; i<cd->nentry; i++) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
444 if (cd->entry[i].orig->offset < min)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
445 min = cd->entry[i].orig->offset;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
446 if (min > (zip_uint64_t)cd->offset) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
447 zip_error_set(error, ZIP_ER_NOZIP, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
448 return -1;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
449 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
450
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
451 j = cd->entry[i].orig->offset + cd->entry[i].orig->comp_size
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
452 + _zip_string_length(cd->entry[i].orig->filename) + LENTRYSIZE;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
453 if (j > max)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
454 max = j;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
455 if (max > (zip_uint64_t)cd->offset) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
456 zip_error_set(error, ZIP_ER_NOZIP, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
457 return -1;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
458 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
459
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
460 if (zip_source_seek(za->src, (zip_int64_t)cd->entry[i].orig->offset, SEEK_SET) < 0) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
461 _zip_error_set_from_source(error, za->src);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
462 return -1;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
463 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
464
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
465 if (_zip_dirent_read(&temp, za->src, NULL, true, error) == -1) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
466 _zip_dirent_finalize(&temp);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
467 return -1;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
468 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
469
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
470 if (_zip_headercomp(cd->entry[i].orig, &temp) != 0) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
471 zip_error_set(error, ZIP_ER_INCONS, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
472 _zip_dirent_finalize(&temp);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
473 return -1;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
474 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
475
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
476 cd->entry[i].orig->extra_fields = _zip_ef_merge(cd->entry[i].orig->extra_fields, temp.extra_fields);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
477 cd->entry[i].orig->local_extra_fields_read = 1;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
478 temp.extra_fields = NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
479
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
480 _zip_dirent_finalize(&temp);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
481 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
482
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
483 return (max-min) < ZIP_INT64_MAX ? (zip_int64_t)(max-min) : ZIP_INT64_MAX;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
484 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
485
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
486
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
487 /* _zip_headercomp:
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
488 compares a central directory entry and a local file header
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
489 Return 0 if they are consistent, -1 if not. */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
490
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
491 static int
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
492 _zip_headercomp(const zip_dirent_t *central, const zip_dirent_t *local)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
493 {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
494 if ((central->version_needed != local->version_needed)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
495 #if 0
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
496 /* some zip-files have different values in local
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
497 and global headers for the bitflags */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
498 || (central->bitflags != local->bitflags)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
499 #endif
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
500 || (central->comp_method != local->comp_method)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
501 || (central->last_mod != local->last_mod)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
502 || !_zip_string_equal(central->filename, local->filename))
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
503 return -1;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
504
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
505 if ((central->crc != local->crc) || (central->comp_size != local->comp_size)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
506 || (central->uncomp_size != local->uncomp_size)) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
507 /* InfoZip stores valid values in local header even when data descriptor is used.
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
508 This is in violation of the appnote. */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
509 if (((local->bitflags & ZIP_GPBF_DATA_DESCRIPTOR) == 0
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
510 || local->crc != 0 || local->comp_size != 0 || local->uncomp_size != 0))
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
511 return -1;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
512 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
513
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
514 return 0;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
515 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
516
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
517
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
518 static zip_t *
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
519 _zip_allocate_new(zip_source_t *src, unsigned int flags, zip_error_t *error)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
520 {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
521 zip_t *za;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
522
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
523 if ((za = _zip_new(error)) == NULL) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
524 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
525 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
526
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
527 za->src = src;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
528 za->open_flags = flags;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
529 if (flags & ZIP_RDONLY) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
530 za->flags |= ZIP_AFL_RDONLY;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
531 za->ch_flags |= ZIP_AFL_RDONLY;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
532 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
533 return za;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
534 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
535
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
536
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
537 /*
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
538 * tests for file existence
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
539 */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
540 static exists_t
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
541 _zip_file_exists(zip_source_t *src, zip_error_t *error)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
542 {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
543 struct zip_stat st;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
544
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
545 zip_stat_init(&st);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
546 if (zip_source_stat(src, &st) != 0) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
547 zip_error_t *src_error = zip_source_error(src);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
548 if (zip_error_code_zip(src_error) == ZIP_ER_READ && zip_error_code_system(src_error) == ENOENT) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
549 return EXISTS_NOT;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
550 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
551 _zip_error_copy(error, src_error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
552 return EXISTS_ERROR;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
553 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
554
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
555 return (st.valid & ZIP_STAT_SIZE) && st.size == 0 ? EXISTS_EMPTY : EXISTS_NONEMPTY;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
556 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
557
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
558
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
559 static zip_cdir_t *
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
560 _zip_find_central_dir(zip_t *za, zip_uint64_t len)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
561 {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
562 zip_cdir_t *cdir, *cdirnew;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
563 zip_uint8_t *match;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
564 zip_int64_t buf_offset;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
565 zip_uint64_t buflen;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
566 zip_int64_t a;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
567 zip_int64_t best;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
568 zip_error_t error;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
569 zip_buffer_t *buffer;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
570
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
571 if (len < EOCDLEN) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
572 zip_error_set(&za->error, ZIP_ER_NOZIP, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
573 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
574 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
575
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
576 buflen = (len < CDBUFSIZE ? len : CDBUFSIZE);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
577 if (zip_source_seek(za->src, -(zip_int64_t)buflen, SEEK_END) < 0) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
578 zip_error_t *src_error = zip_source_error(za->src);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
579 if (zip_error_code_zip(src_error) != ZIP_ER_SEEK || zip_error_code_system(src_error) != EFBIG) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
580 /* seek before start of file on my machine */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
581 _zip_error_copy(&za->error, src_error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
582 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
583 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
584 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
585 if ((buf_offset = zip_source_tell(za->src)) < 0) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
586 _zip_error_set_from_source(&za->error, za->src);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
587 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
588 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
589
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
590 if ((buffer = _zip_buffer_new_from_source(za->src, buflen, NULL, &za->error)) == NULL) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
591 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
592 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
593
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
594 best = -1;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
595 cdir = NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
596 if (buflen >= CDBUFSIZE) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
597 /* EOCD64 locator is before EOCD, so leave place for it */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
598 _zip_buffer_set_offset(buffer, EOCD64LOCLEN);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
599 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
600 zip_error_set(&error, ZIP_ER_NOZIP, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
601
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
602 match = _zip_buffer_get(buffer, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
603 while ((match=_zip_memmem(match, _zip_buffer_left(buffer)-(EOCDLEN-4), (const unsigned char *)EOCD_MAGIC, 4)) != NULL) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
604 _zip_buffer_set_offset(buffer, (zip_uint64_t)(match - _zip_buffer_data(buffer)));
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
605 if ((cdirnew = _zip_read_cdir(za, buffer, (zip_uint64_t)buf_offset, &error)) != NULL) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
606 if (cdir) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
607 if (best <= 0) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
608 best = _zip_checkcons(za, cdir, &error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
609 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
610
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
611 a = _zip_checkcons(za, cdirnew, &error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
612 if (best < a) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
613 _zip_cdir_free(cdir);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
614 cdir = cdirnew;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
615 best = a;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
616 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
617 else {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
618 _zip_cdir_free(cdirnew);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
619 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
620 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
621 else {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
622 cdir = cdirnew;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
623 if (za->open_flags & ZIP_CHECKCONS)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
624 best = _zip_checkcons(za, cdir, &error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
625 else {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
626 best = 0;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
627 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
628 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
629 cdirnew = NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
630 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
631
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
632 match++;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
633 _zip_buffer_set_offset(buffer, (zip_uint64_t)(match - _zip_buffer_data(buffer)));
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
634 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
635
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
636 _zip_buffer_free(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
637
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
638 if (best < 0) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
639 _zip_error_copy(&za->error, &error);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
640 _zip_cdir_free(cdir);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
641 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
642 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
643
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
644 return cdir;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
645 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
646
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
647
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
648 static unsigned char *
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
649 _zip_memmem(const unsigned char *big, size_t biglen, const unsigned char *little, size_t littlelen)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
650 {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
651 const unsigned char *p;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
652
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
653 if ((biglen < littlelen) || (littlelen == 0))
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
654 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
655 p = big-1;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
656 while ((p=(const unsigned char *)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
657 memchr(p+1, little[0], (size_t)(big-(p+1))+(size_t)(biglen-littlelen)+1)) != NULL) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
658 if (memcmp(p+1, little+1, littlelen-1)==0)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
659 return (unsigned char *)p;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
660 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
661
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
662 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
663 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
664
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
665
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
666 static zip_cdir_t *
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
667 _zip_read_eocd(zip_buffer_t *buffer, zip_uint64_t buf_offset, unsigned int flags, zip_error_t *error)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
668 {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
669 zip_cdir_t *cd;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
670 zip_uint64_t i, nentry, size, offset, eocd_offset;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
671
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
672 if (_zip_buffer_left(buffer) < EOCDLEN) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
673 zip_error_set(error, ZIP_ER_INCONS, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
674 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
675 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
676
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
677 eocd_offset = _zip_buffer_offset(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
678
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
679 _zip_buffer_get(buffer, 4); /* magic already verified */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
680
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
681 if (_zip_buffer_get_32(buffer) != 0) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
682 zip_error_set(error, ZIP_ER_MULTIDISK, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
683 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
684 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
685
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
686 /* number of cdir-entries on this disk */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
687 i = _zip_buffer_get_16(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
688 /* number of cdir-entries */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
689 nentry = _zip_buffer_get_16(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
690
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
691 if (nentry != i) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
692 zip_error_set(error, ZIP_ER_NOZIP, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
693 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
694 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
695
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
696 size = _zip_buffer_get_32(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
697 offset = _zip_buffer_get_32(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
698
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
699 if (offset+size < offset) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
700 zip_error_set(error, ZIP_ER_SEEK, EFBIG);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
701 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
702 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
703
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
704 if (offset+size > buf_offset + eocd_offset) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
705 /* cdir spans past EOCD record */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
706 zip_error_set(error, ZIP_ER_INCONS, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
707 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
708 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
709
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
710 if ((flags & ZIP_CHECKCONS) && offset+size != buf_offset + eocd_offset) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
711 zip_error_set(error, ZIP_ER_INCONS, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
712 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
713 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
714
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
715 if ((cd=_zip_cdir_new(nentry, error)) == NULL)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
716 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
717
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
718 cd->size = size;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
719 cd->offset = offset;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
720
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
721 return cd;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
722 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
723
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
724
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
725 static zip_cdir_t *
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
726 _zip_read_eocd64(zip_source_t *src, zip_buffer_t *buffer, zip_uint64_t buf_offset, unsigned int flags, zip_error_t *error)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
727 {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
728 zip_cdir_t *cd;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
729 zip_uint64_t offset;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
730 zip_uint8_t eocd[EOCD64LEN];
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
731 zip_uint64_t eocd_offset;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
732 zip_uint64_t size, nentry, i, eocdloc_offset;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
733 bool free_buffer;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
734 zip_uint32_t num_disks, num_disks64, eocd_disk, eocd_disk64;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
735
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
736 eocdloc_offset = _zip_buffer_offset(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
737
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
738 _zip_buffer_get(buffer, 4); /* magic already verified */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
739
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
740 num_disks = _zip_buffer_get_16(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
741 eocd_disk = _zip_buffer_get_16(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
742 eocd_offset = _zip_buffer_get_64(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
743
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
744 if (eocd_offset > ZIP_INT64_MAX || eocd_offset + EOCD64LEN < eocd_offset) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
745 zip_error_set(error, ZIP_ER_SEEK, EFBIG);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
746 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
747 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
748
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
749 if (eocd_offset + EOCD64LEN > eocdloc_offset + buf_offset) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
750 zip_error_set(error, ZIP_ER_INCONS, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
751 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
752 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
753
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
754 if (eocd_offset >= buf_offset && eocd_offset + EOCD64LEN <= buf_offset + _zip_buffer_size(buffer)) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
755 _zip_buffer_set_offset(buffer, eocd_offset - buf_offset);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
756 free_buffer = false;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
757 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
758 else {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
759 if (zip_source_seek(src, (zip_int64_t)eocd_offset, SEEK_SET) < 0) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
760 _zip_error_set_from_source(error, src);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
761 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
762 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
763 if ((buffer = _zip_buffer_new_from_source(src, EOCD64LEN, eocd, error)) == NULL) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
764 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
765 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
766 free_buffer = true;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
767 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
768
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
769 if (memcmp(_zip_buffer_get(buffer, 4), EOCD64_MAGIC, 4) != 0) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
770 zip_error_set(error, ZIP_ER_INCONS, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
771 if (free_buffer) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
772 _zip_buffer_free(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
773 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
774 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
775 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
776
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
777 size = _zip_buffer_get_64(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
778
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
779 if ((flags & ZIP_CHECKCONS) && size + eocd_offset + 12 != buf_offset + eocdloc_offset) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
780 zip_error_set(error, ZIP_ER_INCONS, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
781 if (free_buffer) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
782 _zip_buffer_free(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
783 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
784 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
785 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
786
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
787 _zip_buffer_get(buffer, 4); /* skip version made by/needed */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
788
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
789 num_disks64 = _zip_buffer_get_32(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
790 eocd_disk64 = _zip_buffer_get_32(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
791
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
792 /* if eocd values are 0xffff, we have to use eocd64 values.
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
793 otherwise, if the values are not the same, it's inconsistent;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
794 in any case, if the value is not 0, we don't support it */
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
795 if (num_disks == 0xffff) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
796 num_disks = num_disks64;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
797 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
798 if (eocd_disk == 0xffff) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
799 eocd_disk = eocd_disk64;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
800 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
801 if ((flags & ZIP_CHECKCONS) && (eocd_disk != eocd_disk64 || num_disks != num_disks64)) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
802 zip_error_set(error, ZIP_ER_INCONS, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
803 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
804 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
805 if (num_disks != 0 || eocd_disk != 0) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
806 zip_error_set(error, ZIP_ER_MULTIDISK, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
807 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
808 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
809
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
810 nentry = _zip_buffer_get_64(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
811 i = _zip_buffer_get_64(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
812
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
813 if (nentry != i) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
814 zip_error_set(error, ZIP_ER_MULTIDISK, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
815 if (free_buffer) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
816 _zip_buffer_free(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
817 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
818 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
819 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
820
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
821 size = _zip_buffer_get_64(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
822 offset = _zip_buffer_get_64(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
823
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
824 if (!_zip_buffer_ok(buffer)) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
825 zip_error_set(error, ZIP_ER_INTERNAL, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
826 if (free_buffer) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
827 _zip_buffer_free(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
828 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
829 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
830 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
831
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
832 if (free_buffer) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
833 _zip_buffer_free(buffer);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
834 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
835
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
836 if (offset > ZIP_INT64_MAX || offset+size < offset) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
837 zip_error_set(error, ZIP_ER_SEEK, EFBIG);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
838 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
839 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
840 if ((flags & ZIP_CHECKCONS) && offset+size != eocd_offset) {
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
841 zip_error_set(error, ZIP_ER_INCONS, 0);
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
842 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
843 }
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
844
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
845 if ((cd=_zip_cdir_new(nentry, error)) == NULL)
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
846 return NULL;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
847
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
848
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
849 cd->size = size;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
850 cd->offset = offset;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
851
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
852 return cd;
8f8c32f102f1 Zip: resurrection
David Demelier <markand@malikania.fr>
parents:
diff changeset
853 }