The_Great_Archive/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2026-09-14 11:06:01 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix FeedReader: truncate oversized feed messages to prevent deserialization failure on startup

Browse Source
This commit is contained in:
jolavillette 2026-05-09 15:03:11 +02:00
parent fcb56e2c5c
commit 079967dcf7
1 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
plugins/FeedReader/services/rsFeedReaderItems.cc
View File

@ -301,6 +301,49 @@ uint32_t RsFeedReaderSerialiser::sizeMsg(RsFeedReaderMsg *item)
s += GetTlvStringSize(item->attachment);
s += GetTlvStringSize(item->attachmentMimeType);
uint32_t sizeLimit = RsSerialiser::MAX_SERIAL_SIZE - 2000;
if (s > sizeLimit) {
uint32_t baseSize = s - GetTlvStringSize(item->description) - GetTlvStringSize(item->descriptionTransformed);
if (baseSize < sizeLimit) {
uint32_t allowedTextSize = sizeLimit - baseSize;
std::string warning = "<p style='color: #d9534f; font-weight: bold; font-size: 1.1em;'>[Warning: This message has been truncated by RetroShare because its size exceeded the 256 KB safety limit.]</p><br/>";
uint32_t neededSpace = warning.size() + 100;
if (item->descriptionTransformed.empty()) {
if (item->description.size() > allowedTextSize) {
if (allowedTextSize > neededSpace) {
item->description = warning + item->description.substr(0, allowedTextSize - neededSpace) + "... [TRUNCATED]";
} else {
item->description = item->description.substr(0, allowedTextSize - 100) + "... [TRUNCATED]";
}
}
} else {
item->description.clear();
if (item->descriptionTransformed.size() > allowedTextSize) {
if (allowedTextSize > neededSpace) {
item->descriptionTransformed = warning + item->descriptionTransformed.substr(0, allowedTextSize - neededSpace) + "... [TRUNCATED]";
} else {
item->descriptionTransformed = item->descriptionTransformed.substr(0, allowedTextSize - 100) + "... [TRUNCATED]";
}
}
}
/* Re-calculate the size after modification */
s = 8;
s += 2;
s += GetTlvStringSize(item->msgId);
s += sizeof(uint32_t);
s += GetTlvStringSize(item->title);
s += GetTlvStringSize(item->link);
s += GetTlvStringSize(item->author);
s += GetTlvStringSize(item->description);
s += GetTlvStringSize(item->descriptionTransformed);
s += sizeof(uint32_t);
s += sizeof(uint32_t);
s += GetTlvStringSize(item->attachmentLink);
s += GetTlvStringSize(item->attachment);
s += GetTlvStringSize(item->attachmentMimeType);
}
}
return s;
}
@ -362,7 +405,9 @@ RsFeedReaderMsg *RsFeedReaderSerialiser::deserialiseMsg(void *data, uint32_t *pk
}
if (*pktsize < rssize) /* check size */
{
return NULL; /* not enough data */
}
/* set the packet length */
*pktsize = rssize;