From 1ec1df5e78769cfdebeeaef943a8f8a8e6251b74 Mon Sep 17 00:00:00 2001
From: Download-Fritz <download-fritz@outlook.com>
Date: Sun, 21 Oct 2018 12:03:18 +0200
Subject: [PATCH] OcMachoLib: Consider the LC buffer might be padded when
 retrieving the next.

---
 Library/OcMachoLib/Header.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Library/OcMachoLib/Header.c b/Library/OcMachoLib/Header.c
index 4e56eb0e..1260bad6 100644
--- a/Library/OcMachoLib/Header.c
+++ b/Library/OcMachoLib/Header.c
@@ -183,7 +183,8 @@ InternalGetNextCommand64 (
   
   for (
     ;
-    (UINTN)Command < TopOfCommands;
+    ((UINTN)Command + sizeof (MACH_LOAD_COMMAND)) < TopOfCommands
+   && ((UINTN)Command + Command->CommandSize) < TopOfCommands;
     Command = NEXT_MACH_LOAD_COMMAND (Command)
     ) {
     if (Command->CommandType == LoadCommandType) {