[Chromecast] Remove usage of nonreentrant functions.

chromecast/crash/linux/dump_info.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #include "chromecast/crash/linux/dump_info.h"
 
 #include <errno.h>
 #include <stddef.h>
 #include <stdlib.h>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
+#include "base/strings/stringprintf.h"
 #include "base/values.h"
 
 namespace chromecast {
 
 namespace {
 
-const char kDumpTimeFormat[] = "%Y-%m-%d %H:%M:%S";
-const unsigned kDumpTimeMaxLen = 255;
+// "%Y-%m-%d %H:%M:%S";
+const char kDumpTimeFormat[] = "%04d-%02d-%02d %02d:%02d:%02d";
 
 const int kNumRequiredParams = 5;
 
 const char kNameKey[] = "name";
 const char kDumpTimeKey[] = "dump_time";
 const char kDumpKey[] = "dump";
 const char kUptimeKey[] = "uptime";
 const char kLogfileKey[] = "logfile";
 const char kSuffixKey[] = "suffix";
 const char kPrevAppNameKey[] = "prev_app_name";
 const char kCurAppNameKey[] = "cur_app_name";
 const char kLastAppNameKey[] = "last_app_name";
 const char kReleaseVersionKey[] = "release_version";
 const char kBuildNumberKey[] = "build_number";
 const char kReasonKey[] = "reason";
 
 }  // namespace
 
 DumpInfo::DumpInfo(const base::Value* entry) : valid_(ParseEntry(entry)) {
 }
 
 DumpInfo::DumpInfo(const std::string& crashed_process_dump,
                    const std::string& logfile,
-                   const time_t& dump_time,
+                   const base::Time& dump_time,
                    const MinidumpParams& params)
     : crashed_process_dump_(crashed_process_dump),
       logfile_(logfile),
       dump_time_(dump_time),
       params_(params),
-      valid_(false) {

[bcf, 2016/08/03 02:40:23]

This is the only place valid_ is set to false, I think we can just drop it.

[ameyak, 2016/08/03 18:50:32]

Acknowledged. Ignored as discussed.

-
-  // Validate the time passed in.
-  struct tm* tm = gmtime(&dump_time);
-  char buf[kDumpTimeMaxLen];
-  int n = strftime(buf, kDumpTimeMaxLen, kDumpTimeFormat, tm);
-  if (n <= 0) {
-    LOG(INFO) << "strftime failed";
-    return;
-  }
-
-  valid_ = true;
-}
+      valid_(true) {}
 
 DumpInfo::~DumpInfo() {
 }
 
 std::unique_ptr<base::Value> DumpInfo::GetAsValue() const {
   std::unique_ptr<base::Value> result =
       base::WrapUnique(new base::DictionaryValue());
   base::DictionaryValue* entry;
   result->GetAsDictionary(&entry);
   entry->SetString(kNameKey, params_.process_name);
 
-  struct tm* tm = gmtime(&dump_time_);
-  char buf[kDumpTimeMaxLen];
-  int n = strftime(buf, kDumpTimeMaxLen, kDumpTimeFormat, tm);
-  DCHECK_GT(n, 0);
-  std::string dump_time(buf);
+  base::Time::Exploded ex;
+  dump_time_.LocalExplode(&ex);
+  std::string dump_time =
+      base::StringPrintf(kDumpTimeFormat, ex.year, ex.month, ex.day_of_month,
+                         ex.hour, ex.minute, ex.second);
   entry->SetString(kDumpTimeKey, dump_time);
 
   entry->SetString(kDumpKey, crashed_process_dump_);
   std::string uptime = std::to_string(params_.process_uptime);
   entry->SetString(kUptimeKey, uptime);
   entry->SetString(kLogfileKey, logfile_);
   entry->SetString(kSuffixKey, params_.suffix);
   entry->SetString(kPrevAppNameKey, params_.previous_app_name);
   entry->SetString(kCurAppNameKey, params_.current_app_name);
   entry->SetString(kLastAppNameKey, params_.last_app_name);
@@ skipping 57 matching lines @@
 
   // Disallow extraneous params
   if (dict->size() != num_params)
     return false;
 
   valid_ = true;
   return true;
 }
 
 bool DumpInfo::SetDumpTimeFromString(const std::string& timestr) {
-  struct tm tm = {0};
-  char* text = strptime(timestr.c_str(), kDumpTimeFormat, &tm);
-  dump_time_ = mktime(&tm);
-  if (!text || dump_time_ < 0) {
+  base::Time::Exploded ex = {0};
+  if (sscanf(timestr.c_str(), kDumpTimeFormat, &ex.year, &ex.month,
+             &ex.day_of_month, &ex.hour, &ex.minute, &ex.second) < 6) {
     LOG(INFO) << "Failed to convert dump time invalid";
     return false;
   }
+
+  dump_time_ = base::Time::FromLocalExploded(ex);
   return true;
 }
 
 }  // namespace chromecast