Commit 2f03e0f1 authored by Dylan Aïssi's avatar Dylan Aïssi
Browse files

Add patch from upstream to fix CVE-2019-10269. (Closes: #926014)

parent 235b29c5
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
bwa (0.7.17-3) UNRELEASED; urgency=medium

  * Team upload.

  [ Dylan Aïssi ]
  * Add patch from upstream to fix CVE-2019-10269.
      (Closes: #926014)

  [ Jelmer Vernooij ]
  * Trim trailing whitespace.

 -- Jelmer Vernooij <jelmer@debian.org>  Sat, 20 Oct 2018 13:21:47 +0000
 -- Dylan Aïssi <daissi@debian.org>  Sat, 30 Mar 2019 15:15:04 +0100

bwa (0.7.17-2) unstable; urgency=medium

+23 −0
Original line number Diff line number Diff line
Author: Heng Li <lh3@me.com>
Description: Fix CVE-2019-10269.
Origin: upstream, https://github.com/lh3/bwa/commit/20d0a13092aa4cb73230492b05f9697d5ef0b88e
Bug: https://github.com/lh3/bwa/pull/232
Bug-Debian: https://bugs.debian.org/926014

--- a/bntseq.c
+++ b/bntseq.c
@@ -197,7 +197,13 @@
 				}
 				while (c != '\n' && c != EOF) c = fgetc(fp);
 				i = 0;
-			} else str[i++] = c; // FIXME: potential segfault here
+			} else {
+				if (i >= 1022) {
+					fprintf(stderr, "[E::%s] sequence name longer than 1023 characters. Abort!\n", __func__);
+					exit(1);
+				}
+				str[i++] = c;
+			}
 		}
 		kh_destroy(str, h);
 		fclose(fp);
+1 −0
Original line number Diff line number Diff line
fix_heap_block_overrun			# See https://github.com/lh3/bwa/issues/146
fix_build_on_freebsd.patch
CVE-2019-10269.patch