mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 23:53:52 +00:00
Code Issues Releases Wiki Activity

Handle std::istream bad state after read

Browse source
This commit is contained in:
elsid 2021-05-03 21:41:47 +02:00
parent 3e4abb9f04
commit 1c08bc0b15
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
components/nif/nifstream.hpp
View file

@ -7,6 +7,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdexcept> #include <stdexcept>
#include <vector> #include <vector>
#include <typeinfo>
#include <components/files/constrainedfilestream.hpp> #include <components/files/constrainedfilestream.hpp>
#include <components/misc/endianness.hpp> #include <components/misc/endianness.hpp>
@ -28,6 +29,9 @@ class NIFFile;
template <std::size_t numInstances, typename T> inline void readLittleEndianBufferOfType(Files::IStreamPtr &pIStream, T* dest) template <std::size_t numInstances, typename T> inline void readLittleEndianBufferOfType(Files::IStreamPtr &pIStream, T* dest)
{ {
pIStream->read((char*)dest, numInstances * sizeof(T)); pIStream->read((char*)dest, numInstances * sizeof(T));
if (pIStream->bad())
throw std::runtime_error("Failed to read little endian typed (" + std::string(typeid(T).name()) + ") buffer of "
+ std::to_string(numInstances) + " instances");
if constexpr (Misc::IS_BIG_ENDIAN) if constexpr (Misc::IS_BIG_ENDIAN)
for (std::size_t i = 0; i < numInstances; i++) for (std::size_t i = 0; i < numInstances; i++)
Misc::swapEndiannessInplace(dest[i]); Misc::swapEndiannessInplace(dest[i]);
@ -39,6 +43,8 @@ template <std::size_t numInstances, typename T> inline void readLittleEndianBuff
template <typename T> inline void readLittleEndianDynamicBufferOfType(Files::IStreamPtr &pIStream, T* dest, std::size_t numInstances) template <typename T> inline void readLittleEndianDynamicBufferOfType(Files::IStreamPtr &pIStream, T* dest, std::size_t numInstances)
{ {
pIStream->read((char*)dest, numInstances * sizeof(T)); pIStream->read((char*)dest, numInstances * sizeof(T));
if (pIStream->bad())
throw std::runtime_error("Failed to read little endian dynamic buffer of " + std::to_string(numInstances) + " instances");
if constexpr (Misc::IS_BIG_ENDIAN) if constexpr (Misc::IS_BIG_ENDIAN)
for (std::size_t i = 0; i < numInstances; i++) for (std::size_t i = 0; i < numInstances; i++)
Misc::swapEndiannessInplace(dest[i]); Misc::swapEndiannessInplace(dest[i]);
@ -144,6 +150,8 @@ public:
{ {
std::string str(length, '\0'); std::string str(length, '\0');
inp->read(str.data(), length); inp->read(str.data(), length);
if (inp->bad())
throw std::runtime_error("Failed to read sized string of " + std::to_string(length) + " chars");
return str; return str;
} }
///Read in a string of the length specified in the file ///Read in a string of the length specified in the file
@ -165,6 +173,8 @@ public:
{ {
std::string result; std::string result;
std::getline(*inp, result); std::getline(*inp, result);
if (inp->bad())
throw std::runtime_error("Failed to read version string");
return result; return result;
} }