DarkStore-3DS/DarkStore
1
0
Fork 0
mirror of https://github.com/DarkStore-3DS/DarkStore.git synced 2026-07-03 00:39:02 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Make JSON reading safer

Browse Source 
- Check that the file actually opened before reading it
- If the JSON was discarded, then make just use an empty object
This commit is contained in:
Pk11
2021-03-23 04:47:49 -05:00
parent 5343661069
commit 77edd99749
7 changed files with 65 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/overlays/storeSelect.cpp
+21 -6
View File
@@ -59,9 +59,14 @@ static const std::vector<Structs::ButtonPos> mainButtons = {
const std::string &file: The file of the UniStore.
*/
static void DeleteStore(const std::string &file) {
nlohmann::json storeJson;
FILE *temp = fopen((std::string(_STORE_PATH) + file).c_str(), "rt");
nlohmann::json storeJson = nlohmann::json::parse(temp, nullptr, false);
fclose(temp);
if (temp) {
storeJson = nlohmann::json::parse(temp, nullptr, false);
fclose(temp);
}
if (storeJson.is_discarded())
storeJson = {};
/* Check, if Spritesheet exist on UniStore. */
if (storeJson["storeInfo"].contains("sheet") && storeJson["storeInfo"]["sheet"].is_array()) {
@@ -105,9 +110,14 @@ static bool DownloadStore() {
if (URL != "") doSheet = DownloadUniStore(URL, -1, file, true);
if (doSheet) {
nlohmann::json storeJson;
FILE *temp = fopen(file.c_str(), "rt");
nlohmann::json storeJson = nlohmann::json::parse(temp, nullptr, false);
fclose(temp);
if (temp) {
storeJson = nlohmann::json::parse(temp, nullptr, false);
fclose(temp);
}
if (storeJson.is_discarded())
storeJson = { };
if (doSheet) {
if (storeJson["storeInfo"].contains("sheetURL") && storeJson["storeInfo"]["sheetURL"].is_array()) {
@@ -158,9 +168,14 @@ static bool UpdateStore(const std::string &URL) {
if (URL != "") doSheet = DownloadUniStore(URL, -1, file, false);
if (doSheet) {
nlohmann::json storeJson;
FILE *temp = fopen(file.c_str(), "rt");
nlohmann::json storeJson = nlohmann::json::parse(temp, nullptr, false);
fclose(temp);
if (temp) {
storeJson = nlohmann::json::parse(temp, nullptr, false);
fclose(temp);
}
if (storeJson.is_discarded())
storeJson = { };
if (doSheet) {
if (storeJson["storeInfo"].contains("sheetURL") && storeJson["storeInfo"]["sheetURL"].is_array()) {