diff options
author | Chris Wilson <chris+github@qwirx.com> | 2014-02-27 23:35:50 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2014-02-27 23:35:50 +0000 |
commit | 9ffa4cabbcac60555f0656640e603f4830a7cb98 (patch) | |
tree | 7a8852c7f50d73c0c40656fd2b73b469b899eaea /lib/backupstore/BackupStoreContext.h | |
parent | 119880f3c92aba8884086dfe4f5faf3e55820f74 (diff) |
Fix crash in BackupStoreContext with no HousekeepingInterface pointer.
Rename mrDaemon to mpHousekeeping and make it a pointer, so that it can
officially be NULL, and don't crash if it is, and we fail to get a lock
on the account.
Diffstat (limited to 'lib/backupstore/BackupStoreContext.h')
-rw-r--r-- | lib/backupstore/BackupStoreContext.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/backupstore/BackupStoreContext.h b/lib/backupstore/BackupStoreContext.h index 9dde2075..e0162636 100644 --- a/lib/backupstore/BackupStoreContext.h +++ b/lib/backupstore/BackupStoreContext.h @@ -45,7 +45,8 @@ class HousekeepingInterface class BackupStoreContext { public: - BackupStoreContext(int32_t ClientID, HousekeepingInterface &rDaemon, + BackupStoreContext(int32_t ClientID, + HousekeepingInterface* mpHousekeeping, const std::string& rConnectionDetails); ~BackupStoreContext(); private: @@ -173,7 +174,7 @@ private: std::string mConnectionDetails; int32_t mClientID; - HousekeepingInterface &mrDaemon; + HousekeepingInterface *mpHousekeeping; int mProtocolPhase; bool mClientHasAccount; std::string mAccountRootDir; // has final directory separator |