From 09a3c8e7417547829b94bcdaa62cdf9e896f29a9 Mon Sep 17 00:00:00 2001 From: cmumford Date: Thu, 20 Jul 2017 15:00:13 -0700 Subject: Switched variable type from int to uint64_t in ConsumeDecimalNumber. An Android test was occasionally crashing with a SEGV in ConsumeDecimalNumber Switching a local variable from an int to uint64_t eliminated these crashes. Speculating this is either a compiler, runtime library, or emulator issue. Switching this type to uint64_t also eliminates a compiler warning about comparing an int with a uint64_t. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=166399695 --- util/logging.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/util/logging.cc b/util/logging.cc index ca6b324..d48b6dd 100644 --- a/util/logging.cc +++ b/util/logging.cc @@ -52,7 +52,8 @@ bool ConsumeDecimalNumber(Slice* in, uint64_t* val) { char c = (*in)[0]; if (c >= '0' && c <= '9') { ++digits; - const int delta = (c - '0'); + // |delta| intentionally unit64_t to avoid Android crash (see log). + const uint64_t delta = (c - '0'); static const uint64_t kMaxUint64 = ~static_cast(0); if (v > kMaxUint64/10 || (v == kMaxUint64/10 && delta > kMaxUint64%10)) { -- cgit v1.2.1