nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-github/pr/863'

Browse Source
This commit is contained in:
teor 2019-04-03 13:12:17 +10:00
commit fdee4dd501
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/pubsub/pubsub_check.c
View File

@ -303,14 +303,14 @@ lint_message_consistency(message_id_t msg,
/* Enforce exclusive-ness for publishers and subscribers that have asked for /* Enforce exclusive-ness for publishers and subscribers that have asked for
* it. * it.
*/ */
if (pub_excl && smartlist_len(pub) > 1) { if (pub_excl && smartlist_len_opt(pub) > 1) {
log_warn(LD_MESG|LD_BUG, log_warn(LD_MESG|LD_BUG,
"Message \"%s\" has multiple publishers, but at least one is " "Message \"%s\" has multiple publishers, but at least one is "
"marked as exclusive.", "marked as exclusive.",
get_message_id_name(msg)); get_message_id_name(msg));
ok = false; ok = false;
} }
if (sub_excl && smartlist_len(sub) > 1) { if (sub_excl && smartlist_len_opt(sub) > 1) {
log_warn(LD_MESG|LD_BUG, log_warn(LD_MESG|LD_BUG,
"Message \"%s\" has multiple subscribers, but at least one is " "Message \"%s\" has multiple subscribers, but at least one is "
"marked as exclusive.", "marked as exclusive.",