Merge branch 'tor-github/pr/1237'

This commit is contained in:
George Kadianakis 2019-08-27 11:43:10 +03:00
commit 5782cee71d
2 changed files with 5 additions and 1 deletions

4
changes/ticket31451 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (logging):
- Fix a code issue that would have broken our parsing of log
domains as soon as we had 33 of them. Fortunately, we still
only have 29. Fixes bug 31451; bugfix on 0.4.1.4-rc.

View File

@ -1285,7 +1285,7 @@ parse_log_domain(const char *domain)
int i;
for (i=0; domain_list[i]; ++i) {
if (!strcasecmp(domain, domain_list[i]))
return (1u<<i);
return (UINT64_C(1)<<i);
}
return 0;
}