_ptr = p;
}
- bool apply(std::vector<char>& output, std::istream& source)
+ bool apply(std::vector<unsigned char>& output, std::istream& source)
{
unsigned char* pEnd = _ptr + instructionLength;
unsigned char* newData = pEnd;
}
bool decodeTextDelta(const SGPath& outputPath)
- {
- string decoded = strutils::decodeBase64(txDeltaData);
+ {
+ std::vector<unsigned char> output, decoded;
+ strutils::decodeBase64(txDeltaData, decoded);
size_t bytesToDecode = decoded.size();
- std::vector<char> output;
- unsigned char* p = (unsigned char*) decoded.data();
+
+ unsigned char* p = decoded.data();
if (memcmp(p, "SVN\0", DELTA_HEADER_SIZE) != 0) {
return false; // bad header
}
while (bytesToDecode > 0) {
if (!SVNDeltaWindow::isWindowComplete(p, bytesToDecode)) {
- SG_LOG(SG_IO, SG_WARN, "SVN txdelta broken window");
- return false;
- }
+ SG_LOG(SG_IO, SG_WARN, "SVN txdelta broken window");
+ return false;
+ }
SVNDeltaWindow window(p);
assert(bytesToDecode >= window.size());
std::ofstream f;
f.open(outputPath.c_str(),
std::ios::out | std::ios::trunc | std::ios::binary);
- f.write(output.data(), output.size());
+ f.write((char*) output.data(), output.size());
// compute MD5 while we have the file in memory
memset(&md5Context, 0, sizeof(SG_MD5_CTX));
finishFile(currentDir->addChildFile(currentPath.file()));
} else if (!strcmp(name, SVN_OPEN_FILE_TAG)) {
DAVResource* res = currentDir->collection()->childWithName(currentPath.file());
- assert(res);
+ if (!res) {
+ SG_LOG(SG_IO, SG_WARN, "SVN open-file: unknown: " << currentPath);
+ fail(SVNRepository::SVN_ERROR_IO);
+ return;
+ }
finishFile(res);
} else if (!strcmp(name, SVN_ADD_DIRECTORY_TAG)) {
// pop directory
} else if (!strcmp(name, SVN_DAV_MD5_CHECKSUM)) {
// validate against (presumably) just written file
if (decodedFileMd5 != md5Sum) {
+ SG_LOG(SG_GENERAL, SG_INFO, "checksum fail on:" << currentPath);
fail(SVNRepository::SVN_ERROR_CHECKSUM);
}
} else if (!strcmp(name, SVN_OPEN_DIRECTORY_TAG)) {
+ currentDir->updateReportComplete();
if (currentDir->parent()) {
// pop the collection stack
currentDir = currentDir->parent();
}
- currentDir->updateReportComplete();
currentPath = currentDir->fsPath();
} else {
// std::cout << "element:" << name;
}
if (tagStack.back() == SVN_SET_PROP_TAG) {
- setPropValue += string(s, length);
+ setPropValue.append(s, length);
} else if (tagStack.back() == SVN_TXDELTA_TAG) {
- txDeltaData += string(s, length);
+ txDeltaData.append(s, length);
} else if (tagStack.back() == SVN_DAV_MD5_CHECKSUM) {
- md5Sum += string(s, length);
+ md5Sum.append(s, length);
}
}