Fix issues found with Coverity Scan

mcveanlab · Nov 1, 2015 · 24d0114 · 24d0114
1 parent c8132c0
commit 24d0114
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,8 +4,12 @@
 #       Instead we use a script to decide if we should do anything
 
 language: c
-compiler: gcc
-os: linux
+compiler:
+- clang
+- gcc
+os:
+- linux
+- osx
 
 sudo: false
 

diff --git a/libs/carrays b/libs/carrays
diff --git a/libs/readsim b/libs/readsim
diff --git a/libs/seq-align b/libs/seq-align
diff --git a/libs/string_buffer b/libs/string_buffer
diff --git a/src/basic/file_util.h b/src/basic/file_util.h
@@ -33,8 +33,8 @@ bool futil_is_file_readable(const char *file);
 bool futil_is_file_writable(const char *file);
 off_t futil_get_file_size(const char* filepath);
 
-#define futil_outpath_str(path) (strcmp(path,"-") == 0 ? "STDOUT" : (path))
-#define futil_inpath_str(path) (strcmp(path,"-") == 0 ? "STDIN" : (path))
+#define futil_outpath_str(path) (!(path) || strcmp(path,"-") == 0 ? "STDOUT" : (path))
+#define futil_inpath_str(path) (!(path) ||strcmp(path,"-") == 0 ? "STDIN" : (path))
 
 /*!
   Create file and parent directories

diff --git a/src/commands/ctx_dist_matrix.c b/src/commands/ctx_dist_matrix.c
@@ -190,12 +190,8 @@ int ctx_dist_matrix(int argc, char **argv)
     fprintf(fout, "\n");
   }
 
-  if(out_path && strcmp(out_path,"-") != 0) {
-    status("[dist_matrix]   written to %s", out_path);
-    fclose(fout);
-  } else {
-    status("[dist_matrix]   written to STDOUT");
-  }
+  status("[dist_matrix]   written to %s", futil_outpath_str(out_path));
+  fclose(fout);
 
   for(i = 0; i < nthreads; i++)
     ctx_free(workers.matrices[i]);

diff --git a/src/commands/ctx_vcfgeno.c b/src/commands/ctx_vcfgeno.c
@@ -751,7 +751,7 @@ int ctx_vcfgeno(int argc, char **argv)
   ctx_free(err_rates);
   ctx_free(log_errs);
   ctx_free(kcovgs);
-  for(r = 0; r < nseqs; r++) ctx_free(ploidy_mat[0]);
+  for(r = 0; r < nseqs; r++) ctx_free(ploidy_mat[r]);
   ctx_free(ploidy_mat);
 
   math_calcs_destroy();
+1 −1		libs/bit_array
+1 −1		libs/seq_file
+1 −1		libs/sort_r
+1 −1		libs/string_buffer
+1 −0		src/alignment.c
+1 −1		src/tools/sw_cmdline.c