comparison libzip/lib/zip_add_entry.c @ 20:3b18afe43c9d

libzip: reimport version 1.1.3
author David Demelier <markand@malikania.fr>
date Wed, 29 Jun 2016 09:24:55 +0200
parents 2306f4b04790
children 056ee6b5913e
comparison
equal deleted inserted replaced
19:07f2cdc6e430 20:3b18afe43c9d
1 /*
2 zip_add_entry.c -- create and init struct zip_entry
3 Copyright (C) 1999-2015 Dieter Baron and Thomas Klausner
4
5 This file is part of libzip, a library to manipulate ZIP archives.
6 The authors can be contacted at <libzip@nih.at>
7
8 Redistribution and use in source and binary forms, with or without
9 modification, are permitted provided that the following conditions
10 are met:
11 1. Redistributions of source code must retain the above copyright
12 notice, this list of conditions and the following disclaimer.
13 2. Redistributions in binary form must reproduce the above copyright
14 notice, this list of conditions and the following disclaimer in
15 the documentation and/or other materials provided with the
16 distribution.
17 3. The names of the authors may not be used to endorse or promote
18 products derived from this software without specific prior
19 written permission.
20
21 THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
22 OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
23 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
24 ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
25 DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
27 GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
28 INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
29 IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
30 OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
31 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
32 */
33
34
35 #include <stdlib.h>
36
37 #include "zipint.h"
38
39
40 /* NOTE: Signed due to -1 on error. See zip_add.c for more details. */
41
42 zip_int64_t
43 _zip_add_entry(zip_t *za)
44 {
45 zip_uint64_t idx;
46
47 if (za->nentry+1 >= za->nentry_alloc) {
48 zip_entry_t *rentries;
49 zip_uint64_t nalloc = za->nentry_alloc;
50 zip_uint64_t additional_entries = 2 * nalloc;
51 zip_uint64_t realloc_size;
52
53 if (additional_entries < 16) {
54 additional_entries = 16;
55 }
56 else if (additional_entries > 1024) {
57 additional_entries = 1024;
58 }
59 /* neither + nor * overflows can happen: nentry_alloc * sizeof(struct zip_entry) < UINT64_MAX */
60 nalloc += additional_entries;
61 realloc_size = sizeof(struct zip_entry) * (size_t)nalloc;
62
63 if (sizeof(struct zip_entry) * (size_t)za->nentry_alloc > realloc_size) {
64 zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
65 return -1;
66 }
67 rentries = (zip_entry_t *)realloc(za->entry, sizeof(struct zip_entry) * (size_t)nalloc);
68 if (!rentries) {
69 zip_error_set(&za->error, ZIP_ER_MEMORY, 0);
70 return -1;
71 }
72 za->entry = rentries;
73 za->nentry_alloc = nalloc;
74 }
75
76 idx = za->nentry++;
77
78 _zip_entry_init(za->entry+idx);
79
80 return (zip_int64_t)idx;
81 }