Changeset 2481 for box/trunk/lib/backupclient/BackupStoreFilenameClear.cpp

Timestamp:

29/03/2009 14:51:24 (3 years ago)

Author:

chris

Message:

Change type of BackupStoreFilename? not to derive from std::string, so
it can't accidentally be used as one.

Fix use of encrypted filename in deleted file message, thanks to Kenny
Millington for reporting.

File:

• box/trunk/lib/backupclient/BackupStoreFilenameClear.cpp (modified) (5 diffs)

box/trunk/lib/backupclient/BackupStoreFilenameClear.cpp

@@ -161 +161 @@
                 
         // Decode the header
-        int size = BACKUPSTOREFILENAME_GET_SIZE(*this);
-        int encoding = BACKUPSTOREFILENAME_GET_ENCODING(*this);
+        int size = BACKUPSTOREFILENAME_GET_SIZE(GetEncodedFilename());
+        int encoding = BACKUPSTOREFILENAME_GET_ENCODING(GetEncodedFilename());
         
         // Decode based on encoding given in the header
@@ -170 +170 @@
                 BOX_TRACE("**** BackupStoreFilename encoded with "
                         "Clear encoding ****");
-                mClearFilename.assign(c_str() + 2, size - 2);
+                mClearFilename.assign(GetEncodedFilename().c_str() + 2,
+                        size - 2);
                 break;
                 
@@ -245 +246 @@
         
         // Store the encoded string
-        assign((char*)buffer, encSize);
+        SetEncodedFilename(std::string((char*)buffer, encSize));
 }
 
@@ -259 +260 @@
 void BackupStoreFilenameClear::DecryptEncoded(CipherContext &rCipherContext) const
 {
+        const std::string& rEncoded = GetEncodedFilename();
+
         // Work out max size
-        int maxOutSize = rCipherContext.MaxOutSizeForInBufferSize(size()) + 4;
+        int maxOutSize = rCipherContext.MaxOutSizeForInBufferSize(rEncoded.size()) + 4;
         
         // Make sure encode/decode buffer has enough space
@@ -269 +272 @@
         
         // Decrypt
-        const char *str = c_str() + 2;
-        int sizeOut = rCipherContext.TransformBlock(buffer, sEncDecBufferSize, str, size() - 2);
+        const char *str = rEncoded.c_str() + 2;
+        int sizeOut = rCipherContext.TransformBlock(buffer, sEncDecBufferSize, str, rEncoded.size() - 2);
         
         // Assign to this