diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-05-31 03:13:26 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-05-31 03:13:26 +0000 |
| commit | 07d6c363100145e3b524639d4999bfcafc6d94ca (patch) | |
| tree | 19f30b1db5d53c6e4b2fe85b4cfbb00c882f1202 /app-arch/gzip/files | |
| parent | Stable ppc-macos (diff) | |
| download | gentoo-2-07d6c363100145e3b524639d4999bfcafc6d94ca.tar.gz gentoo-2-07d6c363100145e3b524639d4999bfcafc6d94ca.tar.bz2 gentoo-2-07d6c363100145e3b524639d4999bfcafc6d94ca.zip | |
Fix segfault on alpha/xorg with a patch from Debian #92232.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'app-arch/gzip/files')
| -rw-r--r-- | app-arch/gzip/files/digest-gzip-1.3.5-r7 | 1 | ||||
| -rw-r--r-- | app-arch/gzip/files/gzip-1.3.5-alpha.patch | 28 |
2 files changed, 29 insertions, 0 deletions
diff --git a/app-arch/gzip/files/digest-gzip-1.3.5-r7 b/app-arch/gzip/files/digest-gzip-1.3.5-r7 new file mode 100644 index 000000000000..07db7e681363 --- /dev/null +++ b/app-arch/gzip/files/digest-gzip-1.3.5-r7 @@ -0,0 +1 @@ +MD5 3d6c191dfd2bf307014b421c12dc8469 gzip-1.3.5.tar.gz 331550 diff --git a/app-arch/gzip/files/gzip-1.3.5-alpha.patch b/app-arch/gzip/files/gzip-1.3.5-alpha.patch new file mode 100644 index 000000000000..c31cd3209595 --- /dev/null +++ b/app-arch/gzip/files/gzip-1.3.5-alpha.patch @@ -0,0 +1,28 @@ +Taken from Debian. + +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=187417 +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=184057 +http://bugs.gentoo.org/92232 + +--- gzip-1.3.5.orig/deflate.c ++++ gzip-1.3.5/deflate.c +@@ -643,7 +643,8 @@ + /* Find the longest match, discarding those <= prev_length. + * At this point we have always match_length < MIN_MATCH + */ +- if (hash_head != NIL && strstart - hash_head <= MAX_DIST) { ++ if (hash_head != NIL && strstart - hash_head <= MAX_DIST && ++ strstart <= window_size - MIN_LOOKAHEAD) { + /* To simplify the code, we prevent matches with the string + * of window index 0 (in particular we have to avoid a match + * of the string with itself at the start of the input file). +@@ -737,7 +738,8 @@ + match_length = MIN_MATCH-1; + + if (hash_head != NIL && prev_length < max_lazy_match && +- strstart - hash_head <= MAX_DIST) { ++ strstart - hash_head <= MAX_DIST && ++ strstart <= window_size - MIN_LOOKAHEAD) { + /* To simplify the code, we prevent matches with the string + * of window index 0 (in particular we have to avoid a match + * of the string with itself at the start of the input file). |