diff options
| author | Odd Stranne <odd@mullvad.net> | 2020-01-28 14:34:10 +0100 |
|---|---|---|
| committer | Odd Stranne <odd@mullvad.net> | 2020-01-28 14:34:10 +0100 |
| commit | e13e04f5104557d8722666fc599502e9c336bdcc (patch) | |
| tree | 02696149b415b628c4291274e8a4fe22b12f9dd4 /windows/nsis-plugins/src/tray/trayparser.cpp | |
| parent | c48e088f5cd7bf101db33e117d8ea7acf86c9580 (diff) | |
| parent | 5ba8f62fb81f13f7ffa9b816ba33cbb814ce1417 (diff) | |
| download | mullvadvpn-e13e04f5104557d8722666fc599502e9c336bdcc.tar.xz mullvadvpn-e13e04f5104557d8722666fc599502e9c336bdcc.zip | |
Merge branch 'less-macro-magic'
Diffstat (limited to 'windows/nsis-plugins/src/tray/trayparser.cpp')
| -rw-r--r-- | windows/nsis-plugins/src/tray/trayparser.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/windows/nsis-plugins/src/tray/trayparser.cpp b/windows/nsis-plugins/src/tray/trayparser.cpp index 4ff3573c81..a2c454e046 100644 --- a/windows/nsis-plugins/src/tray/trayparser.cpp +++ b/windows/nsis-plugins/src/tray/trayparser.cpp @@ -1,20 +1,20 @@ #include "stdafx.h" #include "trayparser.h" -#include <stdexcept> +#include <libcommon/error.h> #include <algorithm> TrayParser::TrayParser(const std::vector<uint8_t> &blob) { if (blob.size() < sizeof(ICON_STREAMS_HEADER)) { - throw std::runtime_error("Invalid icon streams header - truncated"); + THROW_ERROR("Invalid icon streams header - truncated"); } auto header = reinterpret_cast<const ICON_STREAMS_HEADER *>(&blob[0]); if (header->HeaderSize != sizeof(ICON_STREAMS_HEADER)) { - throw std::runtime_error("Invalid icon streams header - size mismatch"); + THROW_ERROR("Invalid icon streams header - size mismatch"); } memcpy(&m_header, header, sizeof(ICON_STREAMS_HEADER)); @@ -30,7 +30,7 @@ TrayParser::TrayParser(const std::vector<uint8_t> &blob) if (blob.size() < sizeof(ICON_STREAMS_HEADER) + sizeof(ICON_STREAMS_RECORD)) { - throw std::runtime_error("Invalid icon streams - truncated"); + THROW_ERROR("Invalid icon streams - truncated"); } const auto lastValidRecordOffset = blob.size() - sizeof(ICON_STREAMS_RECORD); @@ -38,7 +38,7 @@ TrayParser::TrayParser(const std::vector<uint8_t> &blob) if (header->OffsetFirstRecord < header->HeaderSize || header->OffsetFirstRecord > lastValidRecordOffset) { - throw std::runtime_error("Invalid icon streams header - record offset"); + THROW_ERROR("Invalid icon streams header - record offset"); } const auto estimatedSize = header->HeaderSize @@ -47,7 +47,7 @@ TrayParser::TrayParser(const std::vector<uint8_t> &blob) if (blob.size() != estimatedSize) { - throw std::runtime_error("Invalid icon streams - size mismatch"); + THROW_ERROR("Invalid icon streams - size mismatch"); } // |