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 loot_get_plugin_messages bugs.

Browse Source 
Bugs fixed:
* Non-null message pointer outputted when no messages are present.
* Plugins with multiple messages output structures that point to
uninitialised memory.
This commit is contained in:
Oliver Hamlet
2014-11-03 18:48:10 +00:00
parent c0a2d98073
commit f91ca1a157
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/api.cpp
+14 -10
View File
@@ -717,6 +717,7 @@ LOOT_API unsigned int loot_get_plugin_messages(loot_db db, const char * const pl
}
delete[] db->extMessageArray;
db->extMessageArray = nullptr;
db->extMessageArraySize = 0;
}
//Initialise output.
@@ -730,17 +731,20 @@ LOOT_API unsigned int loot_get_plugin_messages(loot_db db, const char * const pl
std::list<loot::Message> temp(p.Messages());
pluginMessages.insert(pluginMessages.end(), temp.begin(), temp.end());
db->extMessageArraySize = pluginMessages.size();
try {
db->extMessageArray = new loot_message[db->extMessageArraySize];
int i = 0;
for (const auto &message : pluginMessages) {
db->extMessageArray[i].type = message.Type();
db->extMessageArray[i].message = ToNewCString(message.ChooseContent(loot::Language::any).Str());
if (!pluginMessages.empty()) {
db->extMessageArraySize = pluginMessages.size();
try {
db->extMessageArray = new loot_message[db->extMessageArraySize];
int i = 0;
for (const auto &message : pluginMessages) {
db->extMessageArray[i].type = message.Type();
db->extMessageArray[i].message = ToNewCString(message.ChooseContent(loot::Language::any).Str());
++i;
}
}
catch (std::bad_alloc& e) {
return c_error(loot_error_no_mem, e.what());
}
}
catch (std::bad_alloc& e) {
return c_error(loot_error_no_mem, e.what());
}
*messages = db->extMessageArray;