Always check input data for strtok - unless -no-check is used

2 files changed, 2 insertions, 1 deletions

diff --git a/src/debug.cpp b/src/debug.cpp
index fd94f1e..45e57d7 100644
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -143,7 +143,7 @@ gsl_vector *gsl_vector_safe_alloc(size_t n) {
 
 char *do_strtok_safe(char *tokenize, const char *delimiters, const char *__pretty_function, const char *__file, int __line) {
   auto token = strtok(tokenize,delimiters);
-  if (token == NULL && (is_debug_mode() || is_strict_mode()))
+  if (token == NULL && is_check_mode())
     fail_at_msg(__file,__line,string("strtok failed in ") + __pretty_function);
   return token;
 }
diff --git a/src/io.cpp b/src/io.cpp
index d20b473..941bacf 100644
--- a/src/io.cpp
+++ b/src/io.cpp
@@ -707,6 +707,7 @@ bool ReadFile_geno(const string &file_geno, const set<string> &setSnps,
       if (indicator_idv[i] == 0)
         continue;
 
+      enforce_msg(ch_ptr,"Problem reading geno file");
       if (strcmp(ch_ptr, "NA") == 0) {
         gsl_vector_set(genotype_miss, c_idv, 1);
         n_miss++;