Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions libarchive/archive_read_support_format_warc.c
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,14 @@ _warc_rdhdr(struct archive_read *a, struct archive_entry *entry)
mtime = rtime;
}
break;
case WT_NONE:
case WT_INFO:
case WT_META:
case WT_REQ:
case WT_RVIS:
case WT_CONV:
case WT_CONT:
case LAST_WT:
default:
fnam.len = 0U;
fnam.str = NULL;
Expand All @@ -361,6 +369,14 @@ _warc_rdhdr(struct archive_read *a, struct archive_entry *entry)
break;
}
/* FALLTHROUGH */
case WT_NONE:
case WT_INFO:
case WT_META:
case WT_REQ:
case WT_RVIS:
case WT_CONV:
case WT_CONT:
case LAST_WT:
default:
/* consume the content and start over */
_warc_skip(a);
Expand Down
5 changes: 5 additions & 0 deletions libarchive/archive_write_set_format_zip.c
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,7 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
zip->entry_flags |= ZIP_ENTRY_FLAG_ENCRYPTED;
zip->entry_encryption = zip->encryption_type;
break;
case ENCRYPTION_NONE:
default:
break;
}
Expand Down Expand Up @@ -709,6 +710,7 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
+ AUTH_CODE_SIZE;
version_needed = 20;
break;
case ENCRYPTION_NONE:
default:
break;
}
Expand Down Expand Up @@ -761,6 +763,7 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
if (version_needed < 20)
version_needed = 20;
break;
case ENCRYPTION_NONE:
default:
break;
}
Expand Down Expand Up @@ -1028,6 +1031,7 @@ archive_write_zip_data(struct archive_write *a, const void *buff, size_t s)
zip->cctx_valid = zip->hctx_valid = 1;
}
break;
case ENCRYPTION_NONE:
default:
break;
}
Expand Down Expand Up @@ -1116,6 +1120,7 @@ archive_write_zip_data(struct archive_write *a, const void *buff, size_t s)
break;
#endif

case COMPRESSION_UNSPECIFIED:
default:
archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
"Invalid ZIP compression type");
Expand Down