diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1d6d8a16fc0..391a0235b21 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-18  Matt Kraai  <kraai@alumni.cmu.edu>
+
+	* java/lang/natVMSecurityManager.cc (getClassContext):
+	Use maxlen instead of len for loop bound.
+
 2003-06-18  Michael Koch  <konqueror@gmx.de>
 
 	* gnu/java/nio/SelectorImpl.java
diff --git a/libjava/java/lang/natVMSecurityManager.cc b/libjava/java/lang/natVMSecurityManager.cc
index 33aa8873f1d..8fd2875aedc 100644
--- a/libjava/java/lang/natVMSecurityManager.cc
+++ b/libjava/java/lang/natVMSecurityManager.cc
@@ -28,7 +28,7 @@ java::lang::VMSecurityManager::getClassContext ()
       int maxlen = t->length();
 
       int len = 0;
-      for (int i=0; i<len; i++)
+      for (int i=0; i<maxlen; i++)
 	{
 	  jclass klass = t->classAt(i);
 	  if (klass != NULL && klass != &java::lang::VMSecurityManager::class$
@@ -41,7 +41,7 @@ java::lang::VMSecurityManager::getClassContext ()
 					       NULL);
 
       len = 0;
-      for (int i=0; i<len; i++)
+      for (int i=0; i<maxlen; i++)
 	{
 	  jclass klass = t->classAt(i);
 	  if (klass != NULL && klass != &java::lang::VMSecurityManager::class$