diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
index c797e20c09..e53102b368 100644
--- a/libavformat/cafdec.c
+++ b/libavformat/cafdec.c
@@ -205,7 +205,7 @@ static void read_info_chunk(AVFormatContext *s, int64_t size)
     AVIOContext *pb = s->pb;
     unsigned int i;
     unsigned int nb_entries = avio_rb32(pb);
-    for (i = 0; i < nb_entries; i++) {
+    for (i = 0; i < nb_entries && !avio_feof(pb); i++) {
         char key[32];
         char value[1024];
         avio_get_str(pb, INT_MAX, key, sizeof(key));