Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

PrivateOugoingMapItem fix offset calculation

Browse Source
This commit is contained in:
Gioacchino Mazzurco 2017-02-28 01:19:18 +01:00
parent 4c89641d3e
commit 0f1106fd8f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libretroshare/src/chat/rschatitems.h
View File

@ -454,7 +454,9 @@ struct PrivateOugoingMapItem : RsChatItem
uint8_t* hdrPtr = static_cast<uint8_t*>(data) + offset; uint8_t* hdrPtr = static_cast<uint8_t*>(data) + offset;
uint32_t tmpsize = entry.second.serial_size(); uint32_t tmpsize = entry.second.serial_size();
ok = ok && entry.second.serialise(hdrPtr, tmpsize); ok = ok && entry.second.serialise(hdrPtr, tmpsize)
&& (offset += tmpsize);
} }
if (offset != tlvsize) if (offset != tlvsize)
@ -505,7 +507,7 @@ struct PrivateOugoingMapItem : RsChatItem
uint8_t* hdrPtr = const_cast<uint8_t*>(data); hdrPtr += offset; uint8_t* hdrPtr = const_cast<uint8_t*>(data); hdrPtr += offset;
uint32_t tmpSize = getRsItemSize(hdrPtr); uint32_t tmpSize = getRsItemSize(hdrPtr);
RsChatMsgItem msgItem(hdrPtr, tmpSize); RsChatMsgItem msgItem(hdrPtr, tmpSize); offset+= tmpSize;
item->store.insert(std::make_pair(msgId, msgItem)); item->store.insert(std::make_pair(msgId, msgItem));
} }
@ -531,7 +533,10 @@ struct PrivateOugoingMapItem : RsChatItem
} }
virtual std::ostream& print(std::ostream &out, uint16_t /*indent*/ = 0) virtual std::ostream& print(std::ostream &out, uint16_t /*indent*/ = 0)
{ return out << "PrivateOugoingMapItem store size: " << store.size(); } {
return out << "PrivateOugoingMapItem store size: " << store.size()
<< std::endl;
}
std::map<uint64_t, RsChatMsgItem> store; std::map<uint64_t, RsChatMsgItem> store;
}; };