diff --git a/loader/pe_image.c b/loader/pe_image.c
index cc2a2df077f..3b025b574d3 100644
--- a/loader/pe_image.c
+++ b/loader/pe_image.c
@@ -421,11 +421,14 @@ static int do_relocations( char *base, const IMAGE_NT_HEADERS *nt, const char *f
     if ((nt->OptionalHeader.ImageBase & 0x80000000) && !((DWORD)base & 0x80000000))
         ERR( "Forced to relocate system DLL (base > 2GB). This is not good.\n" );
 
-    while (rel->VirtualAddress)
+    for ( ; ((char *)rel < base + dir->VirtualAddress + dir->Size) && rel->VirtualAddress;
+          rel = (IMAGE_BASE_RELOCATION*)((char*)rel + rel->SizeOfBlock))
     {
         char *page = base + rel->VirtualAddress;
         int i, count = (rel->SizeOfBlock - 8) / sizeof(rel->TypeOffset);
 
+        if (!count) continue;
+
         /* sanity checks */
         if ((char *)rel + rel->SizeOfBlock > base + dir->VirtualAddress + dir->Size ||
             page > base + nt->OptionalHeader.SizeOfImage)
@@ -462,7 +465,6 @@ static int do_relocations( char *base, const IMAGE_NT_HEADERS *nt, const char *f
                 break;
             }
         }
-        rel = (IMAGE_BASE_RELOCATION*)((char*)rel + rel->SizeOfBlock);
     }
     return 1;
 }