StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Fix potential null pointer dereference.

Browse Source 
This used to not be an issue, but now that the logger is no longer
global, not all source locations may have access to it.
This commit is contained in:
iphydf 2016-09-08 01:15:14 +01:00
parent 54de13c1c7
commit 3521898b0c
No known key found for this signature in database
GPG Key ID: 3855DBA2D74403C9
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toxcore/Messenger.c
View File

@ -2506,7 +2506,7 @@ void do_messenger(Messenger *m, void *userdata)
if (unix_time() > lastdump + DUMPING_CLIENTS_FRIENDS_EVERY_N_SECONDS) {
#ifdef ENABLE_ASSOC_DHT
Assoc_status(m->dht->assoc);
Assoc_status(m->log, m->dht->assoc);
#endif
lastdump = unix_time();

10
toxcore/assoc.c
View File

@ -1071,14 +1071,14 @@ static char *idpart2str(uint8_t *id, size_t len)
return buffer;
}
void Assoc_status(const Assoc *assoc)
void Assoc_status(Logger *log, const Assoc *assoc)
{
if (!assoc) {
LOGGER_TRACE(assoc->log, "Assoc status: no assoc");
LOGGER_TRACE(log, "Assoc status: no assoc");
return;
}
LOGGER_TRACE(assoc->log, "[b:p] hash => [id...] used, seen, heard");
LOGGER_TRACE(log, "[b:p] hash => [id...] used, seen, heard");
size_t bid, cid, total = 0;
@ -1091,7 +1091,7 @@ void Assoc_status(const Assoc *assoc)
if (entry->hash) {
total++;
LOGGER_TRACE(assoc->log, "[%3i:%3i] %08x => [%s...] %i, %i(%c), %i(%c)\n",
LOGGER_TRACE(log, "[%3i:%3i] %08x => [%s...] %i, %i(%c), %i(%c)\n",
(int)bid, (int)cid, entry->hash, idpart2str(entry->client.public_key, 8),
entry->used_at ? (int)(unix_time() - entry->used_at) : 0,
entry->seen_at ? (int)(unix_time() - entry->seen_at) : 0,
@ -1103,7 +1103,7 @@ void Assoc_status(const Assoc *assoc)
}
if (total) {
LOGGER_TRACE(assoc->log, "Total: %i entries, table usage %i%%.\n", (int)total,
LOGGER_TRACE(log, "Total: %i entries, table usage %i%%.\n", (int)total,
(int)(total * 100 / (assoc->candidates_bucket_count * assoc->candidates_bucket_size)));
}
}

2
toxcore/assoc.h
View File

@ -103,6 +103,6 @@ void do_Assoc(Assoc *assoc, DHT *dht);
/* destroy */
void kill_Assoc(Assoc *assoc);
void Assoc_status(const Assoc *assoc);
void Assoc_status(Logger *log, const Assoc *assoc);
#endif /* !__ASSOC_H__ */