aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
Diffstat (limited to 'archival')
-rw-r--r--archival/libunarchive/filter_accept_reject_list.c7
-rw-r--r--archival/libunarchive/find_list_entry.c2
2 files changed, 6 insertions, 3 deletions
diff --git a/archival/libunarchive/filter_accept_reject_list.c b/archival/libunarchive/filter_accept_reject_list.c
index bf983b5e8..439ba20ca 100644
--- a/archival/libunarchive/filter_accept_reject_list.c
+++ b/archival/libunarchive/filter_accept_reject_list.c
@@ -13,11 +13,14 @@
13 */ 13 */
14char filter_accept_reject_list(archive_handle_t *archive_handle) 14char filter_accept_reject_list(archive_handle_t *archive_handle)
15{ 15{
16 const char *key = archive_handle->file_header->name; 16 const char *key;
17 const llist_t *reject_entry = find_list_entry2(archive_handle->reject, key); 17 const llist_t *reject_entry;
18 const llist_t *accept_entry; 18 const llist_t *accept_entry;
19 19
20 key = archive_handle->file_header->name;
21
20 /* If the key is in a reject list fail */ 22 /* If the key is in a reject list fail */
23 reject_entry = find_list_entry2(archive_handle->reject, key);
21 if (reject_entry) { 24 if (reject_entry) {
22 return EXIT_FAILURE; 25 return EXIT_FAILURE;
23 } 26 }
diff --git a/archival/libunarchive/find_list_entry.c b/archival/libunarchive/find_list_entry.c
index f2741039d..754058953 100644
--- a/archival/libunarchive/find_list_entry.c
+++ b/archival/libunarchive/find_list_entry.c
@@ -38,7 +38,7 @@ const llist_t *find_list_entry2(const llist_t *list, const char *filename)
38 if (*c++ == '/') pattern_slash_cnt++; 38 if (*c++ == '/') pattern_slash_cnt++;
39 c = filename; 39 c = filename;
40 d = buf; 40 d = buf;
41 /* paranoia is better that buffer overflows */ 41 /* paranoia is better than buffer overflows */
42 while (*c && d != buf + sizeof(buf)-1) { 42 while (*c && d != buf + sizeof(buf)-1) {
43 if (*c == '/' && --pattern_slash_cnt < 0) 43 if (*c == '/' && --pattern_slash_cnt < 0)
44 break; 44 break;