[BUG] halog: correctly handle truncated last line

If last line is truncated (eg: truncated file), then halog would loop on
it forever.

diff --git a/contrib/halog/fgets2-64.c b/contrib/halog/fgets2-64.c
index 236b970dd2dbb6e87bb7feb1ff0da885822018b5..9aae45465c06fc453e84b0e8e9a85908427fb8e8 100644 (file)
--- a/contrib/halog/fgets2-64.c
+++ b/contrib/halog/fgets2-64.c
@@ -155,6 +155,7 @@ const char *fgets2(FILE *stream)
                                return NULL;
 
                        *end = '\0';
+                       end = line; /* ensure we stop next time */
                        return line;
                }
 

diff --git a/contrib/halog/fgets2.c b/contrib/halog/fgets2.c
index 61d9ef58c9abf840dad799f40777156ca2fe984f..6c5bc6b0a9ef2f53c13e9ed87d057df6e6d947a6 100644 (file)
--- a/contrib/halog/fgets2.c
+++ b/contrib/halog/fgets2.c
@@ -130,6 +130,7 @@ const char *fgets2(FILE *stream)
                                return NULL;
 
                        *end = '\0';
+                       end = line; /* ensure we stop next time */
                        return line;
                }