diff --git a/CheckBufferOverrun.cpp b/CheckBufferOverrun.cpp
index 48625d624..ebd8b0f02 100644
--- a/CheckBufferOverrun.cpp
+++ b/CheckBufferOverrun.cpp
@@ -460,7 +460,10 @@ void CheckBufferOverrunClass::CheckBufferOverrun_StructVariable()
                     }
 
                     tok3 = tok3->next;
-                }
+                }
+
+                if ( ! tok3 )
+                    break;
 
                 if ( ! CheckTok )
                     continue;