commit 5782cee71d2dd02875870269f33ea5761b8097f3 parent d819dfbdede4aafe78b61c02ad8d712fc9e4fc72 Author: George Kadianakis <desnacked@riseup.net> Date: Tue, 27 Aug 2019 11:43:10 +0300 Merge branch 'tor-github/pr/1237' Diffstat:
| A | changes/ticket31451 | | | 4 | ++++ |
| M | src/lib/log/log.c | | | 2 | +- |
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changes/ticket31451 b/changes/ticket31451 @@ -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. diff --git a/src/lib/log/log.c b/src/lib/log/log.c @@ -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; }