Leahnaya/JKSV
1
0
Fork 0
mirror of https://github.com/J-D-K/JKSV.git synced 2026-03-21 17:24:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed root cause of GDrive config parsing crash

Browse Source
This commit is contained in:
Martin Riedel 2023-07-07 16:30:02 -04:00
parent 96cdb7f488
commit aee8d777fc
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/cfg.cpp
View File

@ -309,15 +309,20 @@ static void loadDriveConfig()
if(!clientSecretPath.empty())
{
json_object *installed, *clientID, *clientSecret,*driveJSON = json_object_from_file(clientSecretPath.c_str());
json_object_object_get_ex(driveJSON, "installed", &installed);
json_object_object_get_ex(installed, "client_id", &clientID);
json_object_object_get_ex(installed, "client_secret", &clientSecret);
cfg::driveClientID = json_object_get_string(clientID);
cfg::driveClientSecret = json_object_get_string(clientSecret);
json_object_put(driveJSON);
json_object *installed, *clientID, *clientSecret, *driveJSON = json_object_from_file(clientSecretPath.c_str());
if (driveJSON)
{
if(json_object_object_get_ex(driveJSON, "installed", &installed))
{
if(json_object_object_get_ex(installed, "client_id", &clientID)
&& json_object_object_get_ex(installed, "client_secret", &clientSecret))
{
cfg::driveClientID = json_object_get_string(clientID);
cfg::driveClientSecret = json_object_get_string(clientSecret);
}
}
json_object_put(driveJSON);
}
}
}