diff --git a/src/common/anidecod.cpp b/src/common/anidecod.cpp
index 61888984a6..0fed465c01 100644
--- a/src/common/anidecod.cpp
+++ b/src/common/anidecod.cpp
@@ -331,6 +331,11 @@ bool wxANIDecoder::Load( wxInputStream& stream )
     if (m_nFrames==0)
         return false;
 
+    // Without any loaded icon, m_images[0] below and the public accessors
+    // would index into an empty vector.
+    if (m_images.empty())
+        return false;
+
     if (m_nFrames==m_images.size())
     {
         // if no SEQ chunk is available, display the frames in the order
@@ -340,6 +345,15 @@ bool wxANIDecoder::Load( wxInputStream& stream )
                 m_info[i].m_imageIndex = i;
     }
 
+    // SEQ chunk indices come straight from the input, so reject the file if
+    // any of them would index m_images out of range.
+    for (unsigned int i=0; i<m_nFrames; i++)
+    {
+        if (m_info[i].m_imageIndex < 0 ||
+            static_cast<size_t>(m_info[i].m_imageIndex) >= m_images.size())
+            return false;
+    }
+
     // if some frame has an invalid delay, use the global delay given in the
     // ANI header
     for (unsigned int i=0; i<m_nFrames; i++)
diff --git a/tests/image/image.cpp b/tests/image/image.cpp
index 41f6302efa..2d6d158858 100644
--- a/tests/image/image.cpp
+++ b/tests/image/image.cpp
@@ -1409,6 +1409,67 @@ TEST_CASE_METHOD(ImageHandlersInit, "wxImage::BadPCX", "[image][pcx][error]")
 
 #endif // wxUSE_PCX
 
+TEST_CASE_METHOD(ImageHandlersInit, "wxImage::BadANI", "[image][ani][error]")
+{
+    static const unsigned char data[] =
+    {
+        'R','I','F','F',
+        0x74,0x43,0x00,0x00,
+        'A','C','O','N',
+
+        'a','n','i','h',
+        0x24,0x00,0x00,0x00,
+
+        0x24,0x00,0x00,0x00,
+
+        // nFrames = 4
+        0x04,0x00,0x00,0x00,
+
+        // nSteps = 4
+        0x04,0x00,0x00,0x00,
+
+        0,0,0,0,
+        0,0,0,0,
+        0,0,0,0,
+        0,0,0,0,
+        0x0A,0x00,0x00,0x00,
+        0x01,0x00,0x00,0x00,
+
+        // rate chunk
+        'r','a','t','e',
+        0x10,0x00,0x00,0x00,
+
+        0x0A,0x00,0x00,0x00,
+        0x09,0x00,0x00,0x00,
+        0x09,0x00,0x00,0x00,
+        0x09,0x00,0x00,0x00,
+
+        // seq chunk
+        's','e','q',' ',
+        0x10,0x00,0x00,0x00,
+
+        0x00,0x00,0x00,0x00,
+        0x01,0x00,0x00,0x00,
+        0x02,0x00,0x00,0x00,
+
+        // invalid index 999
+        0xE7,0x03,0x00,0x00,
+
+        // LIST chunk copied from horse.ani
+        'L','I','S','T',
+        0x1C,0x43,0x00,0x00,
+        'f','r','a','m',
+
+        // copy remaining bytes from horse.ani...
+    };
+
+    wxMemoryInputStream mis(data, WXSIZEOF(data));
+
+    wxImage img;
+
+    REQUIRE( !img.LoadFile(mis, wxBITMAP_TYPE_ANI) );
+}
+
 #if wxUSE_XPM
 
 TEST_CASE_METHOD(ImageHandlersInit, "wxImage::BadXPM", "[image][xpm][error]")