diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index e0370aaaa..f75e21ccb 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -2359,8 +2359,16 @@ parse_attribute_subpkts (PKT_user_id * uid)
       if (buflen < n)
 	goto too_short;
 
-      attribs =
-	xrealloc (attribs, (count + 1) * sizeof (struct user_attribute));
+      if (!n)
+        {
+          /* Too short to encode the subpacket type.  */
+          if (opt.verbose)
+            log_info ("attribute subpacket too short\n");
+          break;
+        }
+
+      attribs = xrealloc (attribs,
+                          (count + 1) * sizeof (struct user_attribute));
       memset (&attribs[count], 0, sizeof (struct user_attribute));
 
       type = *buffer;