loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed false successes for db creation.

Browse Source 
* If not on Windows, a local data path must be supplied.
* The supplied paths must be valid directories.
* Added general exception catching.
This commit is contained in:
Oliver Hamlet
2014-11-01 12:39:13 +00:00
parent 3ed2c57a6d
commit 3adf066ea3
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/api.cpp
+16 -4
View File
@@ -248,18 +248,30 @@ LOOT_API unsigned int loot_create_db(loot_db * const db,
boost::filesystem::path game_local_path = "";
if (gameLocalPath != nullptr)
game_local_path = gameLocalPath;
#ifndef _WIN32
else
return c_error(loot_error_invalid_args, "A local data path must be supplied on non-Windows platforms.");
#endif
loot_db retVal = {0};
try {
retVal = new _loot_db_int(clientGame, game_path, game_local_path);
}
// Check for valid paths.
if (gamePath != nullptr && !boost::filesystem::is_directory(gamePath))
return c_error(loot_error_invalid_args, "Given game path \"" + std::string(gamePath) + "\" is not a valid directory.");
if (gameLocalPath != nullptr && !boost::filesystem::is_directory(gameLocalPath))
return c_error(loot_error_invalid_args, "Given local data path \"" + std::string(gameLocalPath) + "\" is not a valid directory.");
*db = new _loot_db_int(clientGame, game_path, game_local_path);
}
catch (loot::error& e) {
return c_error(e);
}
catch (std::bad_alloc& e) {
return c_error(loot_error_no_mem, e.what());
}
*db = retVal;
catch (std::exception& e) {
return c_error(loot_error_invalid_args, e.what());
}
return loot_ok;
}