summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorljfa-ag <ljfa-ag@web.de>2015-09-15 14:59:02 +0200
committerljfa-ag <ljfa-ag@web.de>2015-09-15 14:59:02 +0200
commit2d8cc72760cfd26e56b70786b30c4f6dafe04aa0 (patch)
tree9cca2a856721b9c18e2a050c67a643ce629bd156 /include
parent5d0b98fb46b1aba137677d45b3c74726143eb6fa (diff)
downloadProject-Tick-2d8cc72760cfd26e56b70786b30c4f6dafe04aa0.tar.gz
Project-Tick-2d8cc72760cfd26e56b70786b30c4f6dafe04aa0.zip
Handle nullptr message in zlib_error
Diffstat (limited to 'include')
-rw-r--r--include/io/zlib_error.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/io/zlib_error.h b/include/io/zlib_error.h
index ce375a6ccd..1ecb50e553 100644
--- a/include/io/zlib_error.h
+++ b/include/io/zlib_error.h
@@ -11,7 +11,9 @@ public:
const int errcode;
explicit zlib_error(const char* msg, int errcode):
- std::runtime_error(std::string(zError(errcode)) + ": " + msg),
+ std::runtime_error(msg
+ ? std::string(zError(errcode)) + ": " + msg
+ : zError(errcode)),
errcode(errcode)
{}
};