fix(rime_api.cc): dangling pointer returned from RimeGetSharedDataDir

introduced in commit 4b84dbf

Author: lotem

src/rime/deployer.cc

@@ -7,6 +7,7 @@
 #include <chrono>
 #include <utility>
 #include <boost/date_time/posix_time/posix_time_types.hpp>
+#include <boost/filesystem.hpp>
 #include <rime/deployer.h>
 
 namespace rime {
@@ -136,4 +137,8 @@ void Deployer::JoinMaintenanceThread() {
   JoinWorkThread();
 }
 
+string Deployer::user_data_sync_dir() const {
+  return (boost::filesystem::path(sync_dir) / user_id).string();
+}
+
 }  // namespace rime

src/rime/deployer.h

@@ -11,7 +11,6 @@
 #include <mutex>
 #include <queue>
 #include <boost/any.hpp>
-#include <boost/filesystem.hpp>
 #include <rime/common.h>
 #include <rime/component.h>
 #include <rime/messenger.h>
@@ -33,11 +32,11 @@ class DeploymentTask : public Class<DeploymentTask, TaskInitializer> {
 class Deployer : public Messenger {
  public:
   // read-only access after library initialization {
-  boost::filesystem::path shared_data_dir;
-  boost::filesystem::path user_data_dir;
-  boost::filesystem::path prebuilt_data_dir;
-  boost::filesystem::path staging_dir;
-  boost::filesystem::path sync_dir;
+  string shared_data_dir;
+  string user_data_dir;
+  string prebuilt_data_dir;
+  string staging_dir;
+  string sync_dir;
   string user_id;
   string distribution_name;
   string distribution_code_name;
@@ -64,9 +63,7 @@ class Deployer : public Messenger {
   void JoinWorkThread();
   void JoinMaintenanceThread();
 
-  boost::filesystem::path user_data_sync_dir() const {
-    return sync_dir / user_id;
-  }
+  string user_data_sync_dir() const;
 
  private:
   std::queue<of<DeploymentTask>> pending_tasks_;

src/rime/lever/custom_settings.cc

@@ -33,15 +33,15 @@ CustomSettings::CustomSettings(Deployer* deployer,
 }
 
 bool CustomSettings::Load() {
-  fs::path config_path = deployer_->staging_dir / (config_id_ + ".yaml");
+  fs::path config_path = fs::path(deployer_->staging_dir) / (config_id_ + ".yaml");
   if (!config_.LoadFromFile(config_path.string())) {
-    config_path = deployer_->prebuilt_data_dir / (config_id_ + ".yaml");
+    config_path = fs::path(deployer_->prebuilt_data_dir) / (config_id_ + ".yaml");
     if (!config_.LoadFromFile(config_path.string())) {
       LOG(WARNING) << "cannot find '" << config_id_ << ".yaml'.";
     }
   }
   fs::path custom_config_path =
-      deployer_->user_data_dir / custom_config_file(config_id_);
+      fs::path(deployer_->user_data_dir) / custom_config_file(config_id_);
   if (!custom_config_.LoadFromFile(custom_config_path.string())) {
     return false;
   }

src/rime/lever/deployment_tasks.cc

@@ -78,8 +78,8 @@ bool DetectModifications::Run(Deployer* deployer) {
 
 bool InstallationUpdate::Run(Deployer* deployer) {
   LOG(INFO) << "updating rime installation info.";
-  const fs::path& shared_data_path(deployer->shared_data_dir);
-  const fs::path& user_data_path(deployer->user_data_dir);
+  const fs::path shared_data_path(deployer->shared_data_dir);
+  const fs::path user_data_path(deployer->user_data_dir);
   if (!fs::exists(user_data_path)) {
     LOG(INFO) << "creating user data dir: " << user_data_path.string();
     boost::system::error_code ec;
@@ -104,7 +104,7 @@ bool InstallationUpdate::Run(Deployer* deployer) {
     if (config.GetString("sync_dir", &sync_dir)) {
       deployer->sync_dir = sync_dir;
     } else {
-      deployer->sync_dir = user_data_path / "sync";
+      deployer->sync_dir = (fs::path(user_data_path) / "sync").string();
     }
     LOG(INFO) << "sync dir: " << deployer->sync_dir;
     if (config.GetString("distribution_code_name", &last_distro_code_name)) {
@@ -359,7 +359,7 @@ bool SchemaUpdate::Run(Deployer* deployer) {
   }
 
   LOG(INFO) << "preparing dictionary '" << dict_name << "'.";
-  const fs::path& user_data_path(deployer->user_data_dir);
+  const fs::path user_data_path(deployer->user_data_dir);
   if (!MaybeCreateDirectory(deployer->staging_dir)) {
     return false;
   }
@@ -430,8 +430,8 @@ static bool ConfigNeedsUpdate(Config* config) {
 }
 
 bool ConfigFileUpdate::Run(Deployer* deployer) {
-  const fs::path& shared_data_path(deployer->shared_data_dir);
-  const fs::path& user_data_path(deployer->user_data_dir);
+  const fs::path shared_data_path(deployer->shared_data_dir);
+  const fs::path user_data_path(deployer->user_data_dir);
   // trash depecated user copy created by an older version of Rime
   fs::path source_config_path(shared_data_path / file_name_);
   fs::path dest_config_path(user_data_path / file_name_);
@@ -455,8 +455,8 @@ bool ConfigFileUpdate::Run(Deployer* deployer) {
 }
 
 bool PrebuildAllSchemas::Run(Deployer* deployer) {
-  const fs::path& shared_data_path(deployer->shared_data_dir);
-  const fs::path& user_data_path(deployer->user_data_dir);
+  const fs::path shared_data_path(deployer->shared_data_dir);
+  const fs::path user_data_path(deployer->user_data_dir);
   if (!fs::exists(shared_data_path) || !fs::is_directory(shared_data_path))
     return false;
   bool success = true;
@@ -473,8 +473,8 @@ bool PrebuildAllSchemas::Run(Deployer* deployer) {
 }
 
 bool SymlinkingPrebuiltDictionaries::Run(Deployer* deployer) {
-  const fs::path& shared_data_path(deployer->shared_data_dir);
-  const fs::path& user_data_path(deployer->user_data_dir);
+  const fs::path shared_data_path(deployer->shared_data_dir);
+  const fs::path user_data_path(deployer->user_data_dir);
   if (!fs::exists(shared_data_path) || !fs::is_directory(shared_data_path) ||
       !fs::exists(user_data_path) || !fs::is_directory(user_data_path) ||
       fs::equivalent(shared_data_path, user_data_path))
@@ -545,7 +545,7 @@ static bool IsCustomizedCopy(const string& file_name) {
 
 bool BackupConfigFiles::Run(Deployer* deployer) {
   LOG(INFO) << "backing up config files.";
-  const fs::path& user_data_path(deployer->user_data_dir);
+  const fs::path user_data_path(deployer->user_data_dir);
   if (!fs::exists(user_data_path))
     return false;
   fs::path backup_dir(deployer->user_data_sync_dir());
@@ -592,7 +592,7 @@ bool BackupConfigFiles::Run(Deployer* deployer) {
 
 bool CleanupTrash::Run(Deployer* deployer) {
   LOG(INFO) << "clean up trash.";
-  const fs::path& user_data_path(deployer->user_data_dir);
+  const fs::path user_data_path(deployer->user_data_dir);
   if (!fs::exists(user_data_path))
     return false;
   fs::path trash = user_data_path / "trash";

src/rime/resource.h

@@ -29,7 +29,7 @@ class ResourceResolver {
   RIME_API virtual boost::filesystem::path ResolvePath(const string& resource_id);
   string ToResourceId(const string& file_path) const;
   string ToFilePath(const string& resource_id) const;
-  void set_root_path(const boost::filesystem::path& root_path) {
+  void set_root_path(boost::filesystem::path root_path) {
     root_path_ = root_path;
   }
   boost::filesystem::path root_path() const {
@@ -47,7 +47,7 @@ class FallbackResourceResolver : public ResourceResolver {
       : ResourceResolver(type) {
   }
   RIME_API boost::filesystem::path ResolvePath(const string& resource_id) override;
-  void set_fallback_root_path(const boost::filesystem::path& fallback_root_path) {
+  void set_fallback_root_path(boost::filesystem::path fallback_root_path) {
     fallback_root_path_ = fallback_root_path;
   }
  private:

src/rime/setup.cc

@@ -9,12 +9,15 @@
 #include <glog/logging.h>
 #endif  // RIME_ENABLE_LOGGING
 
+#include <boost/filesystem.hpp>
 #include <rime_api.h>
 #include <rime/deployer.h>
 #include <rime/module.h>
 #include <rime/service.h>
 #include <rime/setup.h>
 
+namespace fs = boost::filesystem;
+
 namespace rime {
 
 #define Q(x) #x
@@ -54,11 +57,11 @@ RIME_API void SetupDeployer(RimeTraits *traits) {
   if (PROVIDED(traits, prebuilt_data_dir))
     deployer.prebuilt_data_dir = traits->prebuilt_data_dir;
   else
-    deployer.prebuilt_data_dir = deployer.shared_data_dir / "build";
+    deployer.prebuilt_data_dir = (fs::path(deployer.shared_data_dir) / "build").string();
   if (PROVIDED(traits, staging_dir))
     deployer.staging_dir = traits->staging_dir;
   else
-    deployer.staging_dir = deployer.user_data_dir / "build";
+    deployer.staging_dir = (fs::path(deployer.user_data_dir) / "build").string();
 }
 
 RIME_API void SetupLogging(const char* app_name, int min_log_level, const char* log_dir) {

src/rime_api.cc

@@ -97,8 +97,8 @@ RIME_API Bool RimeStartMaintenance(Bool full_check) {
   if (!full_check) {
     TaskInitializer args{
       vector<string>{
-        deployer.user_data_dir.string(),
-        deployer.shared_data_dir.string(),
+        deployer.user_data_dir,
+        deployer.shared_data_dir,
       },
     };
     if (!deployer.RunTask("detect_modifications", args)) {
@@ -875,27 +875,27 @@ RIME_API Bool RimeRunTask(const char* task_name) {
 
 RIME_API const char* RimeGetSharedDataDir() {
   Deployer &deployer(Service::instance().deployer());
-  return deployer.shared_data_dir.string().c_str();
+  return deployer.shared_data_dir.c_str();
 }
 
 RIME_API const char* RimeGetUserDataDir() {
   Deployer &deployer(Service::instance().deployer());
-  return deployer.user_data_dir.string().c_str();
+  return deployer.user_data_dir.c_str();
 }
 
 RIME_API const char* RimeGetPrebuiltDataDir() {
   Deployer &deployer(Service::instance().deployer());
-  return deployer.prebuilt_data_dir.string().c_str();
+  return deployer.prebuilt_data_dir.c_str();
 }
 
 RIME_API const char* RimeGetStagingDir() {
   Deployer &deployer(Service::instance().deployer());
-  return deployer.staging_dir.string().c_str();
+  return deployer.staging_dir.c_str();
 }
 
 RIME_API const char* RimeGetSyncDir() {
   Deployer &deployer(Service::instance().deployer());
-  return deployer.sync_dir.string().c_str();
+  return deployer.sync_dir.c_str();
 }
 
 RIME_API const char* RimeGetUserId() {
@@ -905,7 +905,7 @@ RIME_API const char* RimeGetUserId() {
 
 RIME_API void RimeGetUserDataSyncDir(char* dir, size_t buffer_size) {
   Deployer &deployer(Service::instance().deployer());
-  strncpy(dir, deployer.user_data_sync_dir().string().c_str(), buffer_size);
+  strncpy(dir, deployer.user_data_sync_dir().c_str(), buffer_size);
 }
 
 RIME_API Bool RimeConfigInit(RimeConfig* config) {

tools/rime_deployer.cc

@@ -5,12 +5,15 @@
 // 2012-07-07 GONG Chen <chen.sst@gmail.com>
 //
 #include <iostream>
+#include <boost/filesystem.hpp>
 #include <rime/config.h>
 #include <rime/deployer.h>
 #include <rime/service.h>
 #include <rime/setup.h>
 #include <rime/lever/deployment_tasks.h>
 
+using namespace fs = boost::filesystem;
+
 using namespace rime;
 
 int add_schema(int count, char* schemas[]) {
@@ -70,9 +73,9 @@ static void setup_deployer(Deployer* deployer,
   if (argc > 2) {
     deployer->staging_dir = argv[2];
   } else {
-    deployer->staging_dir = deployer->user_data_dir / "build";
+    deployer->staging_dir = (fs::path(deployer->user_data_dir) / "build").string();
   }
-  deployer->prebuilt_data_dir = deployer->shared_data_dir / "build";
+  deployer->prebuilt_data_dir = (fs::path(deployer->shared_data_dir) / "build").string();
 }
 
 int main(int argc, char* argv[]) {

tools/rime_dict_manager.cc

@@ -42,10 +42,7 @@ int main(int argc, char *argv[]) {
     Config config;
     if (config.LoadFromFile("installation.yaml")) {
       config.GetString("installation_id", &deployer.user_id);
-      string sync_dir;
-      if (config.GetString("sync_dir", &sync_dir)) {
-        deployer.sync_dir = sync_dir;
-      }
+      config.GetString("sync_dir", &deployer.sync_dir);
     }
   }
   UserDictManager mgr(&deployer);