summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/libhttrack-dev.lintian-overrides2
-rw-r--r--man/httrack.12
-rw-r--r--src/minizip/zip.c11
3 files changed, 13 insertions, 2 deletions
diff --git a/debian/libhttrack-dev.lintian-overrides b/debian/libhttrack-dev.lintian-overrides
index b70291b..3a20bb7 100644
--- a/debian/libhttrack-dev.lintian-overrides
+++ b/debian/libhttrack-dev.lintian-overrides
@@ -1,5 +1,5 @@
libhttrack-dev: breakout-link *
libhttrack-dev: hardening-no-fortify-functions usr/lib/x86_64-linux-gnu/httrack/libtest/*
-libhttrack-dev: library-not-linked-against-libc usr/lib/*/httrack/libtest/libfilename.so.1.0.0
+libhttrack-dev: library-not-linked-against-libc usr/lib/*/httrack/libtest/*
libhttrack-dev: package-contains-documentation-outside-usr-share-doc usr/share/httrack/libtest/readme.txt
libhttrack-dev: package-name-defined-in-config-h usr/include/httrack/config.h
diff --git a/man/httrack.1 b/man/httrack.1
index 09a0770..5c3b3c9 100644
--- a/man/httrack.1
+++ b/man/httrack.1
@@ -1,7 +1,7 @@
.\" Process this file with
.\" groff -man -Tascii httrack.1
.\"
-.TH httrack 1 "14 January 2023" "httrack website copier"
+.TH httrack 1 "15 January 2023" "httrack website copier"
.SH NAME
httrack \- offline browser : copy websites to a local directory
.SH SYNOPSIS
diff --git a/src/minizip/zip.c b/src/minizip/zip.c
index 91dbe75..8cc5b84 100644
--- a/src/minizip/zip.c
+++ b/src/minizip/zip.c
@@ -1043,6 +1043,17 @@ extern int ZEXPORT zipOpenNewFileInZip4_64(zipFile file, const char* filename, c
return ZIP_PARAMERROR;
#endif
+ // The filename and comment length must fit in 16 bits.
+ if ((filename!=NULL) && (strlen(filename)>0xffff))
+ return ZIP_PARAMERROR;
+ if ((comment!=NULL) && (strlen(comment)>0xffff))
+ return ZIP_PARAMERROR;
+ // The extra field length must fit in 16 bits. If the member also requires
+ // a Zip64 extra block, that will also need to fit within that 16-bit
+ // length, but that will be checked for later.
+ if ((size_extrafield_local>0xffff) || (size_extrafield_global>0xffff))
+ return ZIP_PARAMERROR;
+
zi = (zip64_internal*)file;
if (zi->in_opened_file_inzip == 1)