diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a854a1266e..9ae5da99eb 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -22,6 +22,8 @@
 	(image_set_ptr): Likewise.
 	(alpha_vms_slurp_relocs): Likewise.
 
+	(alpha_vms_object_p): Check for a truncated record.
+
 2017-07-24  Nick Clifton  <nickc@redhat.com>
 
 	PR 21803
diff --git a/bfd/vms-alpha.c b/bfd/vms-alpha.c
index 5e9170d7b1..610b034ccd 100644
--- a/bfd/vms-alpha.c
+++ b/bfd/vms-alpha.c
@@ -2679,6 +2679,9 @@ alpha_vms_object_p (bfd *abfd)
           PRIV (recrd.buf_size) = PRIV (recrd.rec_size);
         }
 
+      /* PR 21813: Check for a truncated record.  */
+      if (PRIV (recrd.rec_size < test_len))
+	goto error_ret;
       /* Read the remaining record.  */
       remaining = PRIV (recrd.rec_size) - test_len;
       to_read = MIN (VMS_BLOCK_SIZE - test_len, remaining);