[med-svn] [Git][med-team/plink1-9][upstream] New upstream version 1.90~b6.24-211108

[Andreas Tille (@tille)]

Andreas Tille pushed to branch upstream at Debian Med / plink1.9


Commits:
04e67a9b by Andreas Tille at 2022-02-03T09:19:13+01:00
New upstream version 1.90~b6.24-211108
- - - - -


2 changed files:

- plink.c
- plink_data.c


Changes:

=====================================
plink.c
=====================================
@@ -105,7 +105,7 @@ static const char ver_str[] =
 #else
   " 32-bit"
 #endif
-  " (6 Jun 2021)";
+  " (8 Nov 2021)";
 static const char ver_str2[] =
   // include leading space if day < 10, so character length stays the same
   " "


=====================================
plink_data.c
=====================================
@@ -16201,7 +16201,8 @@ int32_t merge_datasets(char* bedname, char* bimname, char* famname, char* outnam
 	break;
       }
     }
-    if ((mlpos < merge_ct) && (!feof(mergelistfile))) {
+    // feof() is true if mergelistfile was a named pipe.
+    if ((mlpos < merge_ct) || ferror(mergelistfile)) {
       goto merge_datasets_ret_READ_FAIL;
     }
     fclose_null(&mergelistfile);



View it on GitLab: https://salsa.debian.org/med-team/plink1-9/-/commit/04e67a9bef779f66dd60e894ccbe08b27e8ca458

-- 
View it on GitLab: https://salsa.debian.org/med-team/plink1-9/-/commit/04e67a9bef779f66dd60e894ccbe08b27e8ca458
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220203/94235273/attachment.htm>