From 4ba69b572de7a50b8caa61b5854700100ec61bd7 Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 15 Mar 2010 17:44:54 +0000 Subject: (svn r19427) -Codechange: gracefully handle the case where we can't open a .tar file. --- src/fileio.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/fileio.cpp b/src/fileio.cpp index 1ae3c7e5e..b05e5a648 100644 --- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -563,7 +563,11 @@ bool TarListAddFile(const char *filename) if (it != _tar_list.end()) return false; FILE *f = fopen(filename, "rb"); - assert(f != NULL); + /* Although the file has been found there can be + * a number of reasons we cannot open the file. + * Most common case is when we simply have not + * been given read access. */ + if (f == NULL) return false; const char *dupped_filename = strdup(filename); _tar_list[filename].filename = dupped_filename; -- cgit v1.2.3-70-g09d2