nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-02 16:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make summarize_protover_flags() handle NULL and empty string the same

Browse Source
This commit is contained in:
Neel Chauhan 2020-06-17 11:50:27 -07:00 committed by George Kadianakis
parent 48ff6a41ae
commit 1bd0494f8c
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/ticket34232 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (string handling):
- In summarize_protover_flags(), treat empty strings the same as NULL.
This prevents protocols_known from being set. Previously, we treated
empty strings as normal strings, which led to protocols_known being
set. Fixes bug 34232; bugfix on 0.3.3.2-alpha. Patch by Neel Chauhan.

8
src/core/or/versions.c
View File

@ -490,8 +490,8 @@ memoize_protover_summary(protover_summary_flags_t *out,
/** Summarize the protocols listed in <b>protocols</b> into <b>out</b>, /** Summarize the protocols listed in <b>protocols</b> into <b>out</b>,
* falling back or correcting them based on <b>version</b> as appropriate. * falling back or correcting them based on <b>version</b> as appropriate.
* *
* If protocols and version are both NULL, returns a summary with no flags * If protocols and version are both NULL or "", returns a summary with no
* set. * flags set.
* *
* If the protover string does not contain any recognised protocols, and the * If the protover string does not contain any recognised protocols, and the
* version is not recognised, sets protocols_known, but does not set any other * version is not recognised, sets protocols_known, but does not set any other
@ -504,10 +504,10 @@ summarize_protover_flags(protover_summary_flags_t *out,
{ {
tor_assert(out); tor_assert(out);
memset(out, 0, sizeof(*out)); memset(out, 0, sizeof(*out));
if (protocols) { if (protocols && strcmp(protocols, "")) {
memoize_protover_summary(out, protocols); memoize_protover_summary(out, protocols);
} }
if (version && !strcmpstart(version, "Tor ")) { if (version && strcmp(version, "") && !strcmpstart(version, "Tor ")) {
if (!out->protocols_known) { if (!out->protocols_known) {
/* The version is a "Tor" version, and where there is no /* The version is a "Tor" version, and where there is no
* list of protocol versions that we should be looking at instead. */ * list of protocol versions that we should be looking at instead. */

4
src/test/test_protover.c
View File

@ -789,13 +789,9 @@ test_protover_summarize_flags(void *args)
DEBUG_PROTOVER(flags); DEBUG_PROTOVER(flags);
tt_mem_op(&flags, OP_EQ, &zero_flags, sizeof(flags)); tt_mem_op(&flags, OP_EQ, &zero_flags, sizeof(flags));
/* "" sets the protocols_known flag */
memset(&flags, 0, sizeof(flags)); memset(&flags, 0, sizeof(flags));
summarize_protover_flags(&flags, "", ""); summarize_protover_flags(&flags, "", "");
DEBUG_PROTOVER(flags); DEBUG_PROTOVER(flags);
tt_int_op(flags.protocols_known, OP_EQ, 1);
/* Now clear that flag, and check the rest are zero */
flags.protocols_known = 0;
tt_mem_op(&flags, OP_EQ, &zero_flags, sizeof(flags)); tt_mem_op(&flags, OP_EQ, &zero_flags, sizeof(flags));
/* Now check version exceptions */ /* Now check version exceptions */