WebSVN – spk – Diff – /libspk/src/CatFile.cpp

 		Utils::WString str = c->sFile;
 		cat += str.findReplace(L"/", L"\\").findReplace(L"\\\\", L"\\") + L" " + (long)c->lSize + L"\n";
+	}
 	if ( !cat.length() ) return false;
+	Utils::String str = cat.toString();
 	// make sure the len is in multiples of 5, otherwise decryptData could cause heap problems
-	size_t len = cat.length() + ((cat.length() % 5) ? 5 - (cat.length() % 5) : 0);
+	size_t len = str.length() + ((str.length() % 5) ? 5 - (str.length() % 5) : 0);
 	bool ret = false;
 	try {
 		unsigned char *data = new unsigned char[len + 1];
-		memcpy(data, cat.c_str(), cat.length() * sizeof(unsigned char));
+		memcpy(data, str.c_str(), str.length() * sizeof(unsigned char));
-		for ( size_t i = len; i >= cat.length(); i-- ) data[i] = '\0';
+		for ( size_t i = len; i >= str.length(); i-- ) data[i] = '\0';
 		this->DecryptData(data, len);
-		bool ret = m_fCatFile.write(data, cat.length());
+		bool ret = m_fCatFile.write(data, str.length());
 		delete []data;
+	}
 	catch(std::exception &e) {
 		CLog::logf(CLog::Log_IO, 2, L"CCatFile::WriteCatFile() unable to malloc, %d (%hs)", len + 1, e.what());
 		return false;

Subversion Repositories spk