Merge branch 'hotfix-0.2.17'

ryanlayer · Oct 5, 2015 · 2792d42 · 2792d42
2 parents f2ad973 + e9dcd2f
commit 2792d42
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/genotq.h b/src/genotq.h
@@ -26,7 +26,7 @@
 #define PROGRAM_NAME  "gqt"
 #define MAJOR_VERSION "0"
 #define MINOR_VERSION "2"
-#define REVISION_VERSION "17"
+#define REVISION_VERSION "18"
 #define BUILD_VERSION "0"
 #define VERSION MAJOR_VERSION "." MINOR_VERSION "." REVISION_VERSION
 #define MORE_SIZE 20

diff --git a/src/ped.c b/src/ped.c
@@ -65,7 +65,7 @@ static int char_ll_callback(void *ll_p,
         exit(1);
     }
 
-    new_node->v = (char *) malloc(strlen(argv[label_i])*sizeof(char));
+    new_node->v = (char *) malloc((strlen(argv[label_i])+1)*sizeof(char));
     if (!new_node->v )
         err(EX_OSERR, "malloc error");
     strcpy(new_node->v, argv[label_i]);
@@ -127,7 +127,7 @@ uint32_t convert_file_by_name_ped_to_db(char *bcf_file_name,
         }
 
         char *word;
-        tmp_line = (char *) malloc(strlen(line) * sizeof(char));
+        tmp_line = (char *) malloc((strlen(line)+1) * sizeof(char));
         if (!tmp_line )
             err(EX_OSERR, "malloc error");
         strcpy(tmp_line, line);