diff options
author | Thomas Groman <tgroman@nuegia.net> | 2019-09-19 00:41:48 -0700 |
---|---|---|
committer | Thomas Groman <tgroman@nuegia.net> | 2019-09-19 00:41:48 -0700 |
commit | 32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 (patch) | |
tree | 7be7a2f602e6a5af7bc2db86bef9cf2a659c3d3d /libraries/pack200/src/utils.cpp | |
parent | 5fb2c6334e7d5237db11695b4c0ec0f2d1e47c88 (diff) | |
download | MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.gz MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.lz MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.xz MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.zip |
merged from 0.6.7 codebase
Diffstat (limited to 'libraries/pack200/src/utils.cpp')
-rw-r--r-- | libraries/pack200/src/utils.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libraries/pack200/src/utils.cpp b/libraries/pack200/src/utils.cpp index 0b7d91ca..fd6dad60 100644 --- a/libraries/pack200/src/utils.cpp +++ b/libraries/pack200/src/utils.cpp @@ -50,22 +50,22 @@ void *must_malloc(size_t size) { - size_t msize = size; - void *ptr = (msize > PSIZE_MAX) ? nullptr : malloc(msize); - if (ptr != nullptr) - { - memset(ptr, 0, size); - } - else - { - throw std::runtime_error(ERROR_ENOMEM); - } - return ptr; + size_t msize = size; + void *ptr = (msize > PSIZE_MAX) ? nullptr : malloc(msize); + if (ptr != nullptr) + { + memset(ptr, 0, size); + } + else + { + throw std::runtime_error(ERROR_ENOMEM); + } + return ptr; } void unpack_abort(const char *msg) { - if (msg == nullptr) - msg = "corrupt pack file or internal error"; - throw std::runtime_error(msg); + if (msg == nullptr) + msg = "corrupt pack file or internal error"; + throw std::runtime_error(msg); } |