Procházet zdrojové kódy

Fix 64-bit return issue in parse_log_domain()

If unsigned int is 32-bits long, then our old code would give a
wrong result with any log domain whose mask was >= (1<<32).
Fortunately, there are no such log domains right now: the domain
mask is only 64 bits long to accommodate some flags.

Found by coverity as CID 1452041.

Fixes bug 31451; bugfix on 0.4.1.4-rc.
Nick Mathewson před 4 roky
rodič
revize
87a3c5b110
2 změnil soubory, kde provedl 5 přidání a 1 odebrání
  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;
 }