diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 330b0d7af47..7f1b720b94f 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2021-01-14  Nick Clifton  <nickc@redhat.com>
+
+	* elf.c (elfcore_grok_win32pstatus): Check for a note type of 0.
+
 2021-01-13  Alan Modra  <amodra@gmail.com>
 
 	* Makefile.in: Regenerate.
diff --git a/bfd/elf.c b/bfd/elf.c
index ab19bdb4530..84a5d942817 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -10163,7 +10163,8 @@ elfcore_grok_win32pstatus (bfd *abfd, Elf_Internal_Note *note)
 
   type = bfd_get_32 (abfd, note->descdata);
 
-  struct {
+  struct
+  {
     const char *type_name;
     unsigned long min_size;
   } size_check[] =
@@ -10174,7 +10175,7 @@ elfcore_grok_win32pstatus (bfd *abfd, Elf_Internal_Note *note)
        { "NOTE_INFO_MODULE64", 16 },
       };
 
-  if (type > (sizeof(size_check)/sizeof(size_check[0])))
+  if (type == 0 || type > (sizeof(size_check)/sizeof(size_check[0])))
       return TRUE;
 
   if (note->descsz < size_check[type - 1].min_size)