facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 16:57:49 +03:00
Code Issues Projects Releases Wiki Activity

remotefilelog: explicitly cast from data_offset_t to (s)size_t

Browse Source 
data_offset_t is always 64 bits and (s)size_t are sometimes 32 bits.
This commit is contained in:
Martin von Zweigbergk 2017-04-04 11:48:27 -07:00
parent 817da894d8
commit aaf57af217
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cstore/uniondatapackstore.cpp
View File

@ -36,7 +36,8 @@ mpatch_flist* getNextLink(void* container, ssize_t index) {
delta_chain_link_t *link = links->at(index);
struct mpatch_flist *res;
if ((mpatch_decode((const char*)link->delta, link->delta_sz, &res)) < 0) {
if ((mpatch_decode((const char*)link->delta,
(ssize_t)link->delta_sz, &res)) < 0) {
throw std::logic_error("invalid patch during patch application");
}
@ -59,8 +60,8 @@ ConstantStringRef UnionDatapackStore::get(const Key &key) {
// Short circuit and just return the full text if it's one long
if (links.size() == 0) {
char * finalText = new char[fulltextLink->delta_sz];
memcpy(finalText, fulltextLink->delta, fulltextLink->delta_sz);
return ConstantStringRef(finalText, fulltextLink->delta_sz);
memcpy(finalText, fulltextLink->delta, (size_t)fulltextLink->delta_sz);
return ConstantStringRef(finalText, (size_t)fulltextLink->delta_sz);
}
std::reverse(links.begin(), links.end());
@ -70,14 +71,15 @@ ConstantStringRef UnionDatapackStore::get(const Key &key) {
throw std::logic_error("mpatch failed to fold patches");
}
ssize_t outlen = mpatch_calcsize(fulltextLink->delta_sz, patch);
ssize_t outlen = mpatch_calcsize((ssize_t)fulltextLink->delta_sz, patch);
if (outlen < 0) {
mpatch_lfree(patch);
throw std::logic_error("mpatch failed to calculate size");
}
char *result= new char[outlen];
if (mpatch_apply(result, (const char*)fulltextLink->delta, fulltextLink->delta_sz, patch) < 0) {
if (mpatch_apply(result, (const char*)fulltextLink->delta,
(ssize_t)fulltextLink->delta_sz, patch) < 0) {
delete[] result;
mpatch_lfree(patch);
throw std::logic_error("mpatch failed to apply patches");