Fix some undefined behavior issues?

MakeAnyLenString results in UB (I think?) and is aggressively optimized out with clang
GrantAlternateAdvancementAbility were missing return statements and clang had fun times with those functions too
This commit is contained in:
Michael Cook (mackal) 2016-05-06 21:31:46 -04:00
parent 3bf13c5349
commit f85add14db
2 changed files with 3 additions and 9 deletions

View File

@ -860,17 +860,11 @@ void Database::GetCharName(uint32 char_id, char* name) {
}
bool Database::LoadVariables() {
char *query = nullptr;
auto results = QueryDatabase(query, LoadVariables_MQ(&query));
auto results = QueryDatabase(StringFormat("SELECT varname, value, unix_timestamp() FROM variables where unix_timestamp(ts) >= %d", varcache_lastupdate));
if (!results.Success())
{
safe_delete_array(query);
return false;
}
safe_delete_array(query);
return LoadVariables_result(std::move(results));
}

View File

@ -1049,12 +1049,12 @@ void Lua_Client::IncrementAA(int aa) {
bool Lua_Client::GrantAlternateAdvancementAbility(int aa_id, int points) {
Lua_Safe_Call_Bool();
self->GrantAlternateAdvancementAbility(aa_id, points);
return self->GrantAlternateAdvancementAbility(aa_id, points);
}
bool Lua_Client::GrantAlternateAdvancementAbility(int aa_id, int points, bool ignore_cost) {
Lua_Safe_Call_Bool();
self->GrantAlternateAdvancementAbility(aa_id, points, ignore_cost);
return self->GrantAlternateAdvancementAbility(aa_id, points, ignore_cost);
}
void Lua_Client::MarkSingleCompassLoc(float in_x, float in_y, float in_z) {