mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-08 01:16:33 +02:00
Code Issues Projects Releases Wiki Activity

Fix more &vec[0] problems

Browse Source
This commit is contained in:
Tamás Bálint Misius
2024-04-13 22:32:37 +02:00
parent 73daf67c34
commit 58c0ab4747
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/platform/Common.cpp
View File

@@ -58,7 +58,7 @@ bool ReadFile(std::vector<char> &fileData, ByteString filename)
if (f) f.seekg(0, std::ios::end); if (f) f.seekg(0, std::ios::end);
if (f) fileData.resize(f.tellg()); if (f) fileData.resize(f.tellg());
if (f) f.seekg(0); if (f) f.seekg(0);
if (f) f.read(&fileData[0], fileData.size()); if (f && fileData.size()) f.read(&fileData[0], fileData.size());
if (!f) if (!f)
{ {
std::cerr << "ReadFile: " << filename << ": " << strerror(errno) << std::endl; std::cerr << "ReadFile: " << filename << ": " << strerror(errno) << std::endl;

5
src/prefs/Prefs.cpp
View File

@@ -20,6 +20,11 @@ void Prefs::Read()
Json::CharReaderBuilder rbuilder; Json::CharReaderBuilder rbuilder;
std::unique_ptr<Json::CharReader> const reader(rbuilder.newCharReader()); std::unique_ptr<Json::CharReader> const reader(rbuilder.newCharReader());
ByteString errs; ByteString errs;
if (!data.size())
{
std::cerr << "no json data" << std::endl;
return;
}
if (!reader->parse(&data[0], &data[0] + data.size(), &root, &errs)) if (!reader->parse(&data[0], &data[0] + data.size(), &root, &errs))
{ {
std::cerr << errs << std::endl; std::cerr << errs << std::endl;