Import upstream version 0.11~rc3~r2491

1 files changed, 14 insertions, 9 deletions

diff --git a/lib/backupclient/BackupStoreFilenameClear.cpp b/lib/backupclient/BackupStoreFilenameClear.cpp
index 9114fdd1..e529d8d3 100644
--- a/lib/backupclient/BackupStoreFilenameClear.cpp
+++ b/lib/backupclient/BackupStoreFilenameClear.cpp
@@ -160,15 +160,17 @@ void BackupStoreFilenameClear::MakeClearAvailable() const
 	CheckValid();
 		
 	// 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
 	switch(encoding)
 	{
 	case Encoding_Clear:
-		TRACE0("**** BackupStoreFilename encoded with Clear encoding ****\n");
-		mClearFilename.assign(c_str() + 2, size - 2);
+		BOX_TRACE("**** BackupStoreFilename encoded with "
+			"Clear encoding ****");
+		mClearFilename.assign(GetEncodedFilename().c_str() + 2,
+			size - 2);
 		break;
 		
 	case Encoding_Blowfish:
@@ -193,7 +195,8 @@ static void EnsureEncDecBufferSize(int BufSize)
 	if(spEncDecBuffer == 0)
 	{
 #ifndef WIN32
-		TRACE1("Allocating filename encoding/decoding buffer with size %d\n", BufSize);
+		BOX_TRACE("Allocating filename encoding/decoding buffer "
+			"with size " << BufSize);
 #endif
 		spEncDecBuffer = new MemoryBlockGuard<uint8_t *>(BufSize);
 		MEMLEAKFINDER_NOT_A_LEAK(spEncDecBuffer);
@@ -242,7 +245,7 @@ void BackupStoreFilenameClear::EncryptClear(const std::string &rToEncode, Cipher
 	BACKUPSTOREFILENAME_MAKE_HDR(buffer, encSize, StoreAsEncoding);
 	
 	// Store the encoded string
-	assign((char*)buffer, encSize);
+	SetEncodedFilename(std::string((char*)buffer, encSize));
 }
 
 
@@ -256,8 +259,10 @@ void BackupStoreFilenameClear::EncryptClear(const std::string &rToEncode, Cipher
 // --------------------------------------------------------------------------
 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
 	EnsureEncDecBufferSize(maxOutSize);
@@ -266,8 +271,8 @@ void BackupStoreFilenameClear::DecryptEncoded(CipherContext &rCipherContext) con
 	uint8_t *buffer = *spEncDecBuffer;
 	
 	// 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
 	mClearFilename.assign((char*)buffer, sizeOut);