From 996e63ab073fc25ef986e893675431259a240898 Mon Sep 17 00:00:00 2001
From: Christoph 'SuperVirus' Heitkamp <dev@chrisheitkamp.de>
Date: Thu, 5 Sep 2019 18:31:20 +0000
Subject: [PATCH] fix(config): Fix buffer-overflow and close file properly
---
epicardium/modules/config.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/epicardium/modules/config.c b/epicardium/modules/config.c
index 18e800c3..cb0094c2 100644
--- a/epicardium/modules/config.c
+++ b/epicardium/modules/config.c
@@ -270,17 +270,17 @@ void load_config(void)
);
return;
}
- char buf[CONFIG_MAX_LINE_LENGTH];
+ char buf[CONFIG_MAX_LINE_LENGTH + 1];
int lineNumber = 0;
int nread;
do {
- //zero-terminate in case file is empty
- buf[0] = '\0';
- nread = epic_file_read(fd, buf, sizeof(buf));
- if (nread < sizeof(buf)) {
+ nread = epic_file_read(fd, buf, CONFIG_MAX_LINE_LENGTH);
+ if (nread < CONFIG_MAX_LINE_LENGTH) {
//add fake EOL to ensure termination
- buf[nread] = '\n';
+ buf[nread++] = '\n';
}
+ //zero-terminate buffer
+ buf[nread] = '\0';
char *line = buf;
char *eol = NULL;
int last_eol = 0;
@@ -344,4 +344,5 @@ void load_config(void)
}
}
} while (nread == sizeof(buf));
+ epic_file_close(fd);
}
--
GitLab