src/share/vm/interpreter/bytecodeStream.cpp

Thu, 30 Oct 2008 15:48:59 -0400

author
kamg
date
Thu, 30 Oct 2008 15:48:59 -0400
changeset 848
c7ec737733a6
parent 435
a61af66fc99e
child 905
ad8c8ca4ab0f
permissions
-rw-r--r--

6756528: Bytecodes::special_length_at reads past end of code buffer
Summary: Add end-of-buffer indicator for paths used by the verifier
Reviewed-by: acorn, coleenp

     1 /*
     2  * Copyright 1997-2005 Sun Microsystems, Inc.  All Rights Reserved.
     3  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4  *
     5  * This code is free software; you can redistribute it and/or modify it
     6  * under the terms of the GNU General Public License version 2 only, as
     7  * published by the Free Software Foundation.
     8  *
     9  * This code is distributed in the hope that it will be useful, but WITHOUT
    10  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    11  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    12  * version 2 for more details (a copy is included in the LICENSE file that
    13  * accompanied this code).
    14  *
    15  * You should have received a copy of the GNU General Public License version
    16  * 2 along with this work; if not, write to the Free Software Foundation,
    17  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    18  *
    19  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20  * CA 95054 USA or visit www.sun.com if you need additional information or
    21  * have any questions.
    22  *
    23  */
    25 # include "incls/_precompiled.incl"
    26 # include "incls/_bytecodeStream.cpp.incl"
    28 Bytecodes::Code RawBytecodeStream::raw_next_special(Bytecodes::Code code) {
    29   assert(!is_last_bytecode(), "should have been checked");
    30   // set next bytecode position
    31   address bcp = RawBytecodeStream::bcp();
    32   address end = method()->code_base() + end_bci();
    33   int l = Bytecodes::raw_special_length_at(bcp, end);
    34   if (l <= 0 || (_bci + l) > _end_bci) {
    35     code = Bytecodes::_illegal;
    36   } else {
    37     _next_bci += l;
    38     assert(_bci < _next_bci, "length must be > 0");
    39     // set attributes
    40     _is_wide = false;
    41     // check for special (uncommon) cases
    42     if (code == Bytecodes::_wide) {
    43       if (bcp + 1 >= end) {
    44         code = Bytecodes::_illegal;
    45       } else {
    46         code = (Bytecodes::Code)bcp[1];
    47         _is_wide = true;
    48       }
    49     }
    50   }
    51   _code = code;
    52   return code;
    53 }

mercurial