diff options
| author | teor <teor@torproject.org> | 2019-04-03 13:12:17 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-04-03 13:12:17 +1000 |
| commit | fdee4dd5016aadf5bf44f42b8bb1cad5f40f5672 (patch) | |
| tree | a2bf907b59382713621de9481ce2164a41aec2c7 /src | |
| parent | 965f0d891232f3ece13f8310c9c01f71ec55f25d (diff) | |
| parent | f58587a68dec2cdbcbf3d3d46414c05fc9dfffbd (diff) | |
| download | tor-fdee4dd5016aadf5bf44f42b8bb1cad5f40f5672.tar.gz tor-fdee4dd5016aadf5bf44f42b8bb1cad5f40f5672.zip | |
Merge remote-tracking branch 'tor-github/pr/863'
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/pubsub/pubsub_check.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/pubsub/pubsub_check.c b/src/lib/pubsub/pubsub_check.c index d308dc58aa..a3c22d4f25 100644 --- a/src/lib/pubsub/pubsub_check.c +++ b/src/lib/pubsub/pubsub_check.c @@ -303,14 +303,14 @@ lint_message_consistency(message_id_t msg, /* Enforce exclusive-ness for publishers and subscribers that have asked for * it. */ - if (pub_excl && smartlist_len(pub) > 1) { + if (pub_excl && smartlist_len_opt(pub) > 1) { log_warn(LD_MESG|LD_BUG, "Message \"%s\" has multiple publishers, but at least one is " "marked as exclusive.", get_message_id_name(msg)); ok = false; } - if (sub_excl && smartlist_len(sub) > 1) { + if (sub_excl && smartlist_len_opt(sub) > 1) { log_warn(LD_MESG|LD_BUG, "Message \"%s\" has multiple subscribers, but at least one is " "marked as exclusive.", |