# HG changeset patch
# User kamg
# Date 1283539625 14400
# Node ID 1ab9e2cbfa0ea675a90cbb183a77ee4fbfab4b20
# Parent  6ee4791780667a2448ce9b44bd9bf3080af75e50
6870851: Bad frame_chop in StackMapTable crashes JVM
Summary: Must check locals for null when processing chop frame
Reviewed-by: dholmes, dcubed

diff -r 6ee479178066 -r 1ab9e2cbfa0e src/share/vm/classfile/stackMapTable.cpp
--- a/src/share/vm/classfile/stackMapTable.cpp	Tue Aug 31 03:14:00 2010 -0700
+++ b/src/share/vm/classfile/stackMapTable.cpp	Fri Sep 03 14:47:05 2010 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -152,6 +152,7 @@
 
 int32_t StackMapReader::chop(
     VerificationType* locals, int32_t length, int32_t chops) {
+  if (locals == NULL) return -1;
   int32_t pos = length - 1;
   for (int32_t i=0; i<chops; i++) {
     if (locals[pos].is_category2_2nd()) {