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) {