OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0031513: Data Exchange - FSD_Base64Decoder::Decode() returns buffer with wrong length

Browse Source
This commit is contained in:
kgv 2020-04-22 23:50:55 +03:00 committed by bugmaster
parent 6a2fb7a1d1
commit df9f66149b
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/FSD/FSD_Base64Decoder.cxx
View File

@ -17,6 +17,23 @@
#include <Message.hxx> #include <Message.hxx>
#include <Message_Messenger.hxx> #include <Message_Messenger.hxx>
//! Buffer with decoded data.
class FSD_Base64DecoderBuffer : public NCollection_Buffer
{
public:
//! Empty constructor.
FSD_Base64DecoderBuffer() : NCollection_Buffer (NCollection_BaseAllocator::CommonBaseAllocator()) {}
//! Shrink data size.
void ShrinkSize (Standard_Size theSize)
{
if (theSize < mySize)
{
mySize = theSize;
}
}
};
// ======================================================================= // =======================================================================
// function : Decode // function : Decode
// purpose : // purpose :
@ -37,7 +54,7 @@ Handle(NCollection_Buffer) FSD_Base64Decoder::Decode (const Standard_Byte* theSt
41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 255, 255, 255, 255, 255 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 255, 255, 255, 255, 255
}; };
Handle(NCollection_Buffer) aData = new NCollection_Buffer (NCollection_BaseAllocator::CommonBaseAllocator()); Handle(FSD_Base64DecoderBuffer) aData = new FSD_Base64DecoderBuffer();
if (!aData->Allocate (3 * theLen / 4)) if (!aData->Allocate (3 * theLen / 4))
{ {
Message::SendFail ("Fail to allocate memory."); Message::SendFail ("Fail to allocate memory.");
@ -82,6 +99,8 @@ Handle(NCollection_Buffer) FSD_Base64Decoder::Decode (const Standard_Byte* theSt
++aDataPtr; ++aDataPtr;
} }
} }
// shrink buffer size to actual length
const Standard_Size aFinalLen = aDataPtr - aData->ChangeData();
aData->ShrinkSize (aFinalLen);
return aData; return aData;
} }