diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-10 22:34:27 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-10 22:34:27 +0200 |
| commit | 268ef2d8e904db5068dbdc0fdc7ce3940d6452ea (patch) | |
| tree | b1afa687c97fbf5e1ba2c92c5a10479ae5f832f5 /src/Platform/Buffer.cpp | |
| parent | 6d61f06a5348aebe7dbc0bf44d3e2729c20f7fd0 (diff) | |
| parent | 5f47d8b6f11cdb3c4c2f43e04e5acfc6ffcb3035 (diff) | |
| download | VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.tar.gz VeraCrypt-268ef2d8e904db5068dbdc0fdc7ce3940d6452ea.zip | |
Merge pull request #61 from davidfoerster/normalize-line-terminators
Normalize line terminators
Diffstat (limited to 'src/Platform/Buffer.cpp')
| -rw-r--r-- | src/Platform/Buffer.cpp | 282 |
1 files changed, 141 insertions, 141 deletions
diff --git a/src/Platform/Buffer.cpp b/src/Platform/Buffer.cpp index 4b2ac528..4948a875 100644 --- a/src/Platform/Buffer.cpp +++ b/src/Platform/Buffer.cpp @@ -3,148 +3,148 @@ Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed by the TrueCrypt License 3.0. - Modifications and additions to the original source code (contained in this file) + Modifications and additions to the original source code (contained in this file) and all other portions of this file are Copyright (c) 2013-2016 IDRIX and are governed by the Apache License 2.0 the full text of which is contained in the file License.txt included in VeraCrypt binary and source code distribution packages. -*/
-
-#include "Buffer.h"
-#include "Exception.h"
-
-namespace VeraCrypt
-{
- Buffer::Buffer () : DataPtr (nullptr), DataSize (0)
- {
- }
-
- Buffer::Buffer (size_t size) : DataPtr (nullptr), DataSize (0)
- {
- Allocate (size);
- }
-
- Buffer::~Buffer ()
- {
- if (DataPtr != nullptr)
- Free ();
- }
-
- void Buffer::Allocate (size_t size)
- {
- if (size < 1)
- throw ParameterIncorrect (SRC_POS);
-
- if (DataPtr != nullptr)
- {
- if (DataSize == size)
- return;
- Free();
- }
-
- try
- {
- DataPtr = static_cast<byte *> (Memory::Allocate (size));
- DataSize = size;
- }
- catch (...)
- {
- DataPtr = nullptr;
- DataSize = 0;
- throw;
- }
- }
-
- void Buffer::CopyFrom (const ConstBufferPtr &bufferPtr)
- {
- if (!IsAllocated ())
- {
- if (bufferPtr.Size())
- Allocate (bufferPtr.Size());
- }
- else if (bufferPtr.Size() > DataSize)
- throw ParameterTooLarge (SRC_POS);
-
- if (bufferPtr.Size())
- Memory::Copy (DataPtr, bufferPtr.Get(), bufferPtr.Size());
- }
-
- void Buffer::Erase ()
- {
- if (DataSize > 0)
- Memory::Erase (DataPtr, DataSize);
- }
-
- void Buffer::Free ()
- {
- if (DataPtr == nullptr)
- throw NotInitialized (SRC_POS);
-
- Memory::Free (DataPtr);
- DataPtr = nullptr;
- DataSize = 0;
- }
-
- BufferPtr Buffer::GetRange (size_t offset, size_t size) const
- {
- if (offset + size > DataSize)
- throw ParameterIncorrect (SRC_POS);
-
- return BufferPtr (DataPtr + offset, size);
- }
-
- void Buffer::Zero ()
- {
- if (DataSize > 0)
- Memory::Zero (DataPtr, DataSize);
- }
-
- SecureBuffer::SecureBuffer (size_t size)
- {
- Allocate (size);
- }
-
- SecureBuffer::~SecureBuffer ()
- {
- if (DataPtr != nullptr && DataSize != 0)
- Free ();
- }
-
- void SecureBuffer::Allocate (size_t size)
- {
- Buffer::Allocate (size);
- }
-
- void SecureBuffer::Free ()
- {
- if (DataPtr == nullptr)
- throw NotInitialized (SRC_POS);
-
- Erase ();
- Buffer::Free ();
- }
-
- void BufferPtr::CopyFrom (const ConstBufferPtr &bufferPtr) const
- {
- if (bufferPtr.Size() > DataSize)
- throw ParameterTooLarge (SRC_POS);
-
- Memory::Copy (DataPtr, bufferPtr.Get(), bufferPtr.Size());
- }
-
- BufferPtr BufferPtr::GetRange (size_t offset, size_t size) const
- {
- if (offset + size > DataSize)
- throw ParameterIncorrect (SRC_POS);
-
- return BufferPtr (DataPtr + offset, size);
- }
-
- ConstBufferPtr ConstBufferPtr::GetRange (size_t offset, size_t size) const
- {
- if (offset + size > DataSize)
- throw ParameterIncorrect (SRC_POS);
-
- return ConstBufferPtr (DataPtr + offset, size);
- }
-}
+*/ + +#include "Buffer.h" +#include "Exception.h" + +namespace VeraCrypt +{ + Buffer::Buffer () : DataPtr (nullptr), DataSize (0) + { + } + + Buffer::Buffer (size_t size) : DataPtr (nullptr), DataSize (0) + { + Allocate (size); + } + + Buffer::~Buffer () + { + if (DataPtr != nullptr) + Free (); + } + + void Buffer::Allocate (size_t size) + { + if (size < 1) + throw ParameterIncorrect (SRC_POS); + + if (DataPtr != nullptr) + { + if (DataSize == size) + return; + Free(); + } + + try + { + DataPtr = static_cast<byte *> (Memory::Allocate (size)); + DataSize = size; + } + catch (...) + { + DataPtr = nullptr; + DataSize = 0; + throw; + } + } + + void Buffer::CopyFrom (const ConstBufferPtr &bufferPtr) + { + if (!IsAllocated ()) + { + if (bufferPtr.Size()) + Allocate (bufferPtr.Size()); + } + else if (bufferPtr.Size() > DataSize) + throw ParameterTooLarge (SRC_POS); + + if (bufferPtr.Size()) + Memory::Copy (DataPtr, bufferPtr.Get(), bufferPtr.Size()); + } + + void Buffer::Erase () + { + if (DataSize > 0) + Memory::Erase (DataPtr, DataSize); + } + + void Buffer::Free () + { + if (DataPtr == nullptr) + throw NotInitialized (SRC_POS); + + Memory::Free (DataPtr); + DataPtr = nullptr; + DataSize = 0; + } + + BufferPtr Buffer::GetRange (size_t offset, size_t size) const + { + if (offset + size > DataSize) + throw ParameterIncorrect (SRC_POS); + + return BufferPtr (DataPtr + offset, size); + } + + void Buffer::Zero () + { + if (DataSize > 0) + Memory::Zero (DataPtr, DataSize); + } + + SecureBuffer::SecureBuffer (size_t size) + { + Allocate (size); + } + + SecureBuffer::~SecureBuffer () + { + if (DataPtr != nullptr && DataSize != 0) + Free (); + } + + void SecureBuffer::Allocate (size_t size) + { + Buffer::Allocate (size); + } + + void SecureBuffer::Free () + { + if (DataPtr == nullptr) + throw NotInitialized (SRC_POS); + + Erase (); + Buffer::Free (); + } + + void BufferPtr::CopyFrom (const ConstBufferPtr &bufferPtr) const + { + if (bufferPtr.Size() > DataSize) + throw ParameterTooLarge (SRC_POS); + + Memory::Copy (DataPtr, bufferPtr.Get(), bufferPtr.Size()); + } + + BufferPtr BufferPtr::GetRange (size_t offset, size_t size) const + { + if (offset + size > DataSize) + throw ParameterIncorrect (SRC_POS); + + return BufferPtr (DataPtr + offset, size); + } + + ConstBufferPtr ConstBufferPtr::GetRange (size_t offset, size_t size) const + { + if (offset + size > DataSize) + throw ParameterIncorrect (SRC_POS); + + return ConstBufferPtr (DataPtr + offset, size); + } +} |