From 2d8cc72760cfd26e56b70786b30c4f6dafe04aa0 Mon Sep 17 00:00:00 2001 From: ljfa-ag Date: Tue, 15 Sep 2015 14:59:02 +0200 Subject: Handle nullptr message in zlib_error --- include/io/zlib_error.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include') 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) {} }; -- cgit 0.0.5-2-1-g0f52