frodovdr/vdr-plugin-satip
1
0
Fork 0
mirror of https://github.com/rofafor/vdr-plugin-satip.git synced 2023-10-10 13:37:42 +02:00
Code Issues Releases Wiki Activity

Added a memory guard for cSatipMemoryBuffer().

Browse Source
This commit is contained in:
Rolf Ahrenberg 2015-03-26 00:23:55 +02:00
parent 19a6a4a5ee
commit fbf7977853
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
common.h
View File

@ -86,7 +86,10 @@
class cSatipMemoryBuffer { class cSatipMemoryBuffer {
private: private:
char *dataM; enum {
eMaxDataSize = MEGABYTE(2)
};
char *dataM;
size_t sizeM; size_t sizeM;
void *AllocBuffer(void *ptrP, size_t sizeP) void *AllocBuffer(void *ptrP, size_t sizeP)
{ {
@ -105,15 +108,20 @@ public:
size_t Add(char *dataP, size_t sizeP) size_t Add(char *dataP, size_t sizeP)
{ {
if (sizeP > 0) { if (sizeP > 0) {
dataM = (char *)AllocBuffer(dataM, sizeM + sizeP + 1); size_t len = sizeM + sizeP + 1;
if (dataM) { if (len < eMaxDataSize) {
memcpy(&(dataM[sizeM]), dataP, sizeP); dataM = (char *)AllocBuffer(dataM, len);
sizeM += sizeP; if (dataM) {
dataM[sizeM] = 0; memcpy(&(dataM[sizeM]), dataP, sizeP);
return sizeP; sizeM += sizeP;
} dataM[sizeM] = 0;
else return sizeP;
esyslog("[%s,%d]: Failed to allocate memory", __FILE__, __LINE__); }
else
esyslog("[%s,%d]: Failed to allocate memory", __FILE__, __LINE__);
}
else
esyslog("[%s,%d]: Buffer overflow", __FILE__, __LINE__);
} }
return 0; return 0;
}; };