summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/util_file.c23
1 files changed, 13 insertions, 10 deletions
diff --git a/source3/lib/util_file.c b/source3/lib/util_file.c
index 194fb7ae49..50bd85e6e3 100644
--- a/source3/lib/util_file.c
+++ b/source3/lib/util_file.c
@@ -217,21 +217,24 @@ int getfileline(void *vp, char *linebuf, int linebuf_size)
*/
linebuf_len = strlen(linebuf);
- if (linebuf[linebuf_len - 1] != '\n')
+ if (linebuf_len > 0)
{
- c = '\0';
- while (!ferror(fp) && !feof(fp))
+ if (linebuf[linebuf_len - 1] != '\n')
{
- c = fgetc(fp);
- if (c == '\n')
+ c = '\0';
+ while (!ferror(fp) && !feof(fp))
{
- break;
+ c = fgetc(fp);
+ if (c == '\n')
+ {
+ break;
+ }
}
}
- }
- else
- {
- linebuf[linebuf_len - 1] = '\0';
+ else
+ {
+ linebuf[linebuf_len - 1] = '\0';
+ }
}
#ifdef DEBUG_PASSWORD