[med-svn] [gmap] 06/12: Imported Upstream version 2015-12-31.v5

[Alex Mestiashvili]

This is an automated email from the git hooks/post-receive script.

malex-guest pushed a commit to branch master
in repository gmap.

commit 8a5235297562deb240540393c248b468f9404ee0
Author: Alexandre Mestiashvili <alex at biotec.tu-dresden.de>
Date:   Tue Jan 19 13:14:27 2016 +0100

    Imported Upstream version 2015-12-31.v5
---
 ChangeLog      | 4 ++++
 src/stage1hr.c | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 88bfd7a..950af6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-15  twu
+
+    * stage1hr.c: Fixed array overflow involving MAX_ANCHORS algorithm
+
 2016-01-12  twu
 
     * stage3hr.c, substring.c: Reverting back to remove salvage procedure for
diff --git a/src/stage1hr.c b/src/stage1hr.c
index 39a686f..bf6a34f 100644
--- a/src/stage1hr.c
+++ b/src/stage1hr.c
@@ -1,4 +1,4 @@
-static char rcsid[] = "$Id: stage1hr.c 181909 2016-01-07 20:41:49Z twu $";
+static char rcsid[] = "$Id: stage1hr.c 182407 2016-01-15 17:41:06Z twu $";
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -4487,12 +4487,12 @@ identify_all_segments (int *nsegments, List_T *anchor_segments, Segment_T **spli
 
   debug(printf("%d all segments\n",List_length(all_segments)));
   debug(printf("%d anchor segments\n",List_length(*anchor_segments)));
-  if (List_length(all_segments) < MAX_ANCHORS) {
+  if (List_length(all_segments) <= MAX_ANCHORS) {
     /* Might as well use all segments */
     List_free(&(*anchor_segments));
     *anchor_segments = List_reverse(all_segments);
 
-  } else if (List_length(*anchor_segments) < MAX_ANCHORS) {
+  } else if (List_length(*anchor_segments) <= MAX_ANCHORS) {
     /* Use only the good anchor segments */
     List_free(&all_segments);
     *anchor_segments = List_reverse(*anchor_segments);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gmap.git