Merge pull request #185 from voutcn/fix/1pass

fix make test error
voutcn · Nov 2, 2018 · b70d24b · b70d24b
2 parents ef1bae6 + 4bbc46b
commit b70d24b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,7 @@
+### 1.1.3 / 2018-11-01 PST
+
+* Fixed a bug in mercy edge stage in 1-pass mode
+
 ### 1.1.3 / 2018-03-02 PST
 
 * Fix a bug in atomic bit vector that may cause a race condition

diff --git a/cx1_read2sdbg_s2.cpp b/cx1_read2sdbg_s2.cpp
@@ -153,7 +153,10 @@ void s2_read_mercy_prepare(read2sdbg_global_t &globals) {
             }
 
             uint64_t this_end = std::min(start_idx[tid] + avg, (uint64_t)mercy_cand.size());
-            uint64_t read_id = globals.package.get_id(mercy_cand[this_end] >> 2);
+            uint64_t read_id = 0;
+            if (this_end < mercy_cand.size()) {
+                read_id = globals.package.get_id(mercy_cand[this_end] >> 2);
+            }
 
             while (this_end < mercy_cand.size() && globals.package.get_id(mercy_cand[this_end] >> 2) == read_id) {
                 ++this_end;