Merge branch 'jdaw/fix-undefined-sanitizer-failure' into 'master'

fix sanitizer failure See merge request machine-learning/ont-minimap2!6
nanoporetech · Sep 18, 2023 · b58015a · b58015a
2 parents 4e733e3 + 5db0b95
commit b58015a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -22,9 +22,11 @@ build:windows:
     BUILD_OPTIONS: "-A x64"
   <<: *build
   tags:
-    - win10-gpu
+    - windows-10
+    - VS2019
 
 build:macos:m1:
   <<: *build
   tags:
-    - m1
+    - xcode-13.3.1
+    - m1
diff --git a/src/patches/0003-Skip-radix-sort-if-no-seed-hits.patch b/src/patches/0003-Skip-radix-sort-if-no-seed-hits.patch
@@ -0,0 +1,13 @@
+diff --git a/map.c b/map.c
+index 038888f..ff38e8b 100644
+--- a/map.c
++++ b/map.c
+@@ -199,7 +199,7 @@ static mm128_t *collect_seed_hits(void *km, const mm_mapopt_t *opt, int max_occ,
+ 		}
+ 	}
+ 	kfree(km, m);
+-	radix_sort_128x(a, a + (*n_a));
++	if (a != NULL) radix_sort_128x(a, a + (*n_a));
+ 	return a;
+ }
+