Browse Source

Merge branch 'tor-github/pr/1237'

George Kadianakis 4 years ago
parent
commit
5782cee71d
2 changed files with 5 additions and 1 deletions
  1. 4 0
      changes/ticket31451
  2. 1 1
      src/lib/log/log.c

+ 4 - 0
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.

+ 1 - 1
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;
 }