summaryrefslogtreecommitdiff
path: root/libre/unzip/overflow-fsize.patch
diff options
context:
space:
mode:
authorfreaj <freaj@riseup.net>2015-03-17 08:39:50 +0100
committerfreaj <freaj@riseup.net>2015-03-17 08:39:50 +0100
commit5c2f3e3963bc955563bc53f882d76da2e37fa01c (patch)
tree0de6dceb92a1d1b7b7e389506b2524c15b9abfd6 /libre/unzip/overflow-fsize.patch
parent87e90fe1d4913ffad0c4046e8ff9ec899db20e11 (diff)
parent53c554ed87485a3fac0b8a73dba70f5b0e06218e (diff)
Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre
Diffstat (limited to 'libre/unzip/overflow-fsize.patch')
-rw-r--r--libre/unzip/overflow-fsize.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/libre/unzip/overflow-fsize.patch b/libre/unzip/overflow-fsize.patch
new file mode 100644
index 000000000..910b22d56
--- /dev/null
+++ b/libre/unzip/overflow-fsize.patch
@@ -0,0 +1,34 @@
+t a/list.c b/list.c
+index f7359c3..4c3d703 100644
+--- a/list.c
++++ b/list.c
+@@ -97,7 +97,7 @@ int list_files(__G) /* return PK-type error code */
+ {
+ int do_this_file=FALSE, cfactor, error, error_in_archive=PK_COOL;
+ #ifndef WINDLL
+- char sgn, cfactorstr[10];
++ char sgn, cfactorstr[13];
+ int longhdr=(uO.vflag>1);
+ #endif
+ int date_format;
+@@ -339,7 +339,19 @@ int list_files(__G) /* return PK-type error code */
+ G.crec.compression_method == ENHDEFLATED) {
+ methbuf[5] = dtype[(G.crec.general_purpose_bit_flag>>1) & 3];
+ } else if (methnum >= NUM_METHODS) {
+- sprintf(&methbuf[4], "%03u", G.crec.compression_method);
++ /* 2013-02-26 SMS.
++ * http://sourceforge.net/tracker/?func=detail
++ * &aid=2861648&group_id=118012&atid=679786
++ * Unexpectedly large compression methods overflow
++ * &methbuf[]. Use the old, three-digit decimal format
++ * for values which fit. Otherwise, sacrifice the
++ * colon, and use four-digit hexadecimal.
++ */
++ if (G.crec.compression_method <= 999) {
++ sprintf( &methbuf[ 4], "%03u", G.crec.compression_method);
++ } else {
++ sprintf( &methbuf[ 3], "%04X", G.crec.compression_method);
++ }
+ }
+
+ #if 0 /* GRR/Euro: add this? */