diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a058dc5a9e7..d0444666c5f 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-07  Tom Tromey  <tromey@redhat.com>
+
+	* verify.cc (skip_padding): Fail if padding byte is nonzero.
+
 2001-11-06  Tom Tromey  <tromey@redhat.com>
 
 	* HACKING: Make people commit their own patches.
diff --git a/libjava/verify.cc b/libjava/verify.cc
index a32af685700..272a9ebfb3a 100644
--- a/libjava/verify.cc
+++ b/libjava/verify.cc
@@ -1000,7 +1000,8 @@ private:
   void skip_padding ()
   {
     while ((PC % 4) > 0)
-      get_byte ();
+      if (get_byte () != 0)
+	verify_fail ("found nonzero padding byte");
   }
 
   // Return the subroutine to which the instruction at PC belongs.