Fix addtaxonomy always crashing due to invalid check

soedinglab · Sep 10, 2020 · 333cc35 · 333cc35
1 parent 29e327f
commit 333cc35
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/taxonomy/addtaxonomy.cpp b/src/taxonomy/addtaxonomy.cpp
@@ -70,10 +70,10 @@ int addtaxonomy(int argc, const char **argv, const Command &command) {
             if (par.pickIdFrom == Parameters::EXTRACT_QUERY) {
                 val.first = key;
                 mappingIt = std::upper_bound(mapping.begin(), mapping.end(), val, compareToFirstInt);
-            }
-            if (mappingIt == mapping.end() || mappingIt->first != val.first) {
-                taxonNotFound++;
-                continue;
+                if (mappingIt == mapping.end() || mappingIt->first != val.first) {
+                    taxonNotFound++;
+                    continue;
+                }
             }
 
             while (*data != '\0') {
@@ -87,11 +87,11 @@ int addtaxonomy(int argc, const char **argv, const Command &command) {
                     unsigned int id = Util::fast_atoi<unsigned int>(entry[0]);
                     val.first = id;
                     mappingIt = std::upper_bound(mapping.begin(), mapping.end(), val, compareToFirstInt);
-                }
-                if (mappingIt == mapping.end() || mappingIt->first != val.first) {
-                    taxonNotFound++;
-                    data = Util::skipLine(data);
-                    continue;
+                    if (mappingIt == mapping.end() || mappingIt->first != val.first) {
+                        taxonNotFound++;
+                        data = Util::skipLine(data);
+                        continue;
+                    }
                 }
                 unsigned int taxon = mappingIt->second;
                 TaxonNode const *node = t->taxonNode(taxon, false);