Merge remote-tracking branch 'remotes/internal/release_1.0.3a'

Author: daisyden

include/caffe/util/cpu_info.hpp

@@ -83,7 +83,7 @@ class CpuInfo : public CpuInfoInterface {
   const char *currentLine;
 
   void loadContentFromFile(const char *fileName);
-  void loadContent(const char *content);
+  void loadContent(std::string &content);
   void parseLines(char *content);
 };
 

src/caffe/util/cpu_info.cpp

@@ -61,7 +61,8 @@ CpuInfo::CpuInfo() {
 }
 
 CpuInfo::CpuInfo(const char *content) {
-  loadContent(content);
+  std::string str_content(content);
+  loadContent(str_content);
 }
 
 void CpuInfo::loadContentFromFile(const char *fileName) {
@@ -70,13 +71,13 @@ void CpuInfo::loadContentFromFile(const char *fileName) {
     (std::istreambuf_iterator<char>(file)),
     (std::istreambuf_iterator<char>()));
 
-  loadContent(content.c_str());
+  loadContent(content);
 }
 
-void CpuInfo::loadContent(const char *content) {
-  size_t contentLength = strlen(content);
+void CpuInfo::loadContent(std::string &content) {
+  size_t contentLength = content.length();
   char *contentCopy = new char[contentLength + 1];
-  snprintf(contentCopy, contentLength + 1, "%s", content);
+  snprintf(contentCopy, contentLength + 1, "%s", content.c_str());
 
   parseLines(contentCopy);