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/Memory.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/Memory.cpp')
| -rw-r--r-- | src/Platform/Memory.cpp | 106 |
1 files changed, 53 insertions, 53 deletions
diff --git a/src/Platform/Memory.cpp b/src/Platform/Memory.cpp index 7a543a8c..c8c04766 100644 --- a/src/Platform/Memory.cpp +++ b/src/Platform/Memory.cpp @@ -3,60 +3,60 @@ 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 "Common/Tcdefs.h"
-#include "Memory.h"
-#include "Exception.h"
-
-namespace VeraCrypt
-{
- void *Memory::Allocate (std::size_t size)
- {
- if (size < 1)
- throw ParameterIncorrect (SRC_POS);
-
- void *bufPtr = malloc (size);
- if (!bufPtr)
- throw bad_alloc();
-
- return bufPtr;
- }
-
- int Memory::Compare (const void *memory1, size_t size1, const void *memory2, size_t size2)
- {
- if (size1 > size2)
- return 1;
- else if (size1 < size2)
- return -1;
-
- return memcmp (memory1, memory2, size1);
- }
-
- void Memory::Copy (void *memoryDestination, const void *memorySource, size_t size)
- {
- assert (memoryDestination != nullptr && memorySource != nullptr);
- memcpy (memoryDestination, memorySource, size);
- }
-
- void Memory::Erase (void *memory, size_t size)
- {
- burn (memory, size);
- }
-
- void Memory::Zero (void *memory, size_t size)
- {
- memset (memory, 0, size);
- }
-
- void Memory::Free (void *memory)
- {
- assert (memory != nullptr);
- free (memory);
- }
-}
+*/ + +#include "Common/Tcdefs.h" +#include "Memory.h" +#include "Exception.h" + +namespace VeraCrypt +{ + void *Memory::Allocate (std::size_t size) + { + if (size < 1) + throw ParameterIncorrect (SRC_POS); + + void *bufPtr = malloc (size); + if (!bufPtr) + throw bad_alloc(); + + return bufPtr; + } + + int Memory::Compare (const void *memory1, size_t size1, const void *memory2, size_t size2) + { + if (size1 > size2) + return 1; + else if (size1 < size2) + return -1; + + return memcmp (memory1, memory2, size1); + } + + void Memory::Copy (void *memoryDestination, const void *memorySource, size_t size) + { + assert (memoryDestination != nullptr && memorySource != nullptr); + memcpy (memoryDestination, memorySource, size); + } + + void Memory::Erase (void *memory, size_t size) + { + burn (memory, size); + } + + void Memory::Zero (void *memory, size_t size) + { + memset (memory, 0, size); + } + + void Memory::Free (void *memory) + { + assert (memory != nullptr); + free (memory); + } +} |