--- a/hotspot/src/share/vm/logging/logTagSet.hpp	Fri Aug 26 14:47:52 2016 -0700
+++ b/hotspot/src/share/vm/logging/logTagSet.hpp	Tue Apr 05 16:51:58 2016 +0200
@@ -86,7 +86,7 @@
   }
 
   bool contains(LogTagType tag) const {
-    for (size_t i = 0; _tag[i] != LogTag::__NO_TAG; i++) {
+    for (size_t i = 0; i < LogTag::MaxTags && _tag[i] != LogTag::__NO_TAG; i++) {
       if (tag == _tag[i]) {
         return true;
       }