VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/Library
diff options
context:
space:
mode:
authorkavsrf <kavsrf@gmail.com>2016-09-17 01:00:44 +0300
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2016-10-17 18:17:43 +0200
commit5fb01149ef1cecc36b261094b304ff0654bb7ae3 (patch)
treeccef2539faf18ffb8a2e29cd9f96e228c93cb4dc /Library
parentb6d7ea98fc46c20b59860edcffac13fee89d69b0 (diff)
downloadVeraCrypt-DCS-5fb01149ef1cecc36b261094b304ff0654bb7ae3.tar.gz
VeraCrypt-DCS-5fb01149ef1cecc36b261094b304ff0654bb7ae3.zip
DcsRe select volume is added to boot from usb
Notes (7.2, 7.4)
Diffstat (limited to 'Library')
-rw-r--r--Library/CommonLib/EfiBio.c3
-rw-r--r--Library/GraphLib/EfiGraph.c1
-rw-r--r--Library/VeraCryptLib/DcsVeraCrypt.c7
3 files changed, 8 insertions, 3 deletions
diff --git a/Library/CommonLib/EfiBio.c b/Library/CommonLib/EfiBio.c
index 9577c08..e6509f9 100644
--- a/Library/CommonLib/EfiBio.c
+++ b/Library/CommonLib/EfiBio.c
@@ -71,6 +71,7 @@ EfiGetHandles(
{
EFI_STATUS res = EFI_BUFFER_TOO_SMALL;
UINTN BufferSize;
+ if ((Buffer == NULL) || (Count == NULL)) return EFI_INVALID_PARAMETER;
if(*Buffer != NULL) MEM_FREE(*Buffer);
*Count = 0;
*Buffer = (EFI_HANDLE*) MEM_ALLOC(sizeof(EFI_HANDLE));
@@ -80,7 +81,7 @@ EfiGetHandles(
if (res == RETURN_BUFFER_TOO_SMALL) {
MEM_FREE(*Buffer);
*Buffer = (EFI_HANDLE*)MEM_ALLOC(BufferSize);
- if (!Buffer) {
+ if (*Buffer == NULL) {
return EFI_OUT_OF_RESOURCES;
}
res = gBS->LocateHandle(SearchType, Protocol, SearchKey, &BufferSize, *Buffer);
diff --git a/Library/GraphLib/EfiGraph.c b/Library/GraphLib/EfiGraph.c
index b8e8e2e..3e90646 100644
--- a/Library/GraphLib/EfiGraph.c
+++ b/Library/GraphLib/EfiGraph.c
@@ -235,6 +235,7 @@ BltPoint(
IN UINTN x,
IN UINTN y
) {
+ if (!draw) draw = &gDrawContext;
if (draw->Brush == NULL) return BltPointSingle(blt, draw, x, y);
else
{
diff --git a/Library/VeraCryptLib/DcsVeraCrypt.c b/Library/VeraCryptLib/DcsVeraCrypt.c
index 9cf57ce..ba92931 100644
--- a/Library/VeraCryptLib/DcsVeraCrypt.c
+++ b/Library/VeraCryptLib/DcsVeraCrypt.c
@@ -37,8 +37,11 @@ BOOL ConfigRead(char *configKey, char *configValue, int maxValueSize)
{
char *xml;
- if (ConfigBuffer == NULL)
- FileLoad(NULL, L"\\EFI\\VeraCrypt\\DcsProp", &ConfigBuffer, &ConfigBufferSize);
+ if (ConfigBuffer == NULL) {
+ if (FileLoad(NULL, L"\\EFI\\VeraCrypt\\DcsProp", &ConfigBuffer, &ConfigBufferSize) != EFI_SUCCESS) {
+ return FALSE;
+ }
+ }
xml = ConfigBuffer;
if (xml != NULL)