From 0cea318493ae406e5fff6e10eb8d3e171603a0c0 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 7 Mar 2015 02:06:29 +0100 Subject: [PATCH] Make read_file() thread-safe. This is long overdue, of course; I knew this function was a quick hack, but didn't realize it was a problem until Christophe Thommeret reported an issue that looked a lot like this. --- util.cpp | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/util.cpp b/util.cpp index e08a085..3ebf162 100644 --- a/util.cpp +++ b/util.cpp @@ -87,17 +87,41 @@ string read_file(const string &filename) { const string full_pathname = *movit_data_directory + "/" + filename; - static char buf[131072]; FILE *fp = fopen(full_pathname.c_str(), "r"); if (fp == NULL) { perror(full_pathname.c_str()); exit(1); } - int len = fread(buf, 1, sizeof(buf), fp); + int ret = fseek(fp, 0, SEEK_END); + if (ret == -1) { + perror("fseek(SEEK_END)"); + exit(1); + } + + int size = ftell(fp); + + ret = fseek(fp, 0, SEEK_SET); + if (ret == -1) { + perror("fseek(SEEK_SET)"); + exit(1); + } + + string str; + str.resize(size); + ret = fread(&str[0], size, 1, fp); + if (ret == -1) { + perror("fread"); + exit(1); + } + if (ret == 0) { + fprintf(stderr, "Short read when trying to read %d bytes from %s\n", + size, full_pathname.c_str()); + exit(1); + } fclose(fp); - return string(buf, len); + return str; } string read_version_dependent_file(const string &base, const string &extension) -- 2.39.2