From 90bc29c1b544c0436ec44246e180fdbb6d6384df Mon Sep 17 00:00:00 2001 From: "Roland C. Dowdeswell" Date: Wed, 9 May 2018 00:39:11 -0400 Subject: [PATCH] jv_file.c: check to see if the file is a directory and fail Not all stdio implementations disallow one to open a directory with fopen(3) and so we specifically check for directories as it is also in the standard search path. --- src/jv_file.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/jv_file.c b/src/jv_file.c index 4c0060fc4d..b10bcc0b5c 100644 --- a/src/jv_file.c +++ b/src/jv_file.c @@ -1,16 +1,33 @@ +#include #include +#include #include #include #include +#include #include "jv.h" #include "jv_unicode.h" jv jv_load_file(const char* filename, int raw) { - FILE* file = fopen(filename, "r"); + struct stat sb; + int fd = open(filename, O_RDONLY); + if (fd == -1) { + return jv_invalid_with_msg(jv_string_fmt("Could not open %s: %s", + filename, + strerror(errno))); + } + if (fstat(fd, &sb) == -1 || S_ISDIR(sb.st_mode)) { + close(fd); + return jv_invalid_with_msg(jv_string_fmt("Could not open %s: %s", + filename, + "It's a directory")); + } + FILE* file = fdopen(fd, "r"); struct jv_parser* parser = NULL; jv data; if (!file) { + close(fd); return jv_invalid_with_msg(jv_string_fmt("Could not open %s: %s", filename, strerror(errno)));