src/java.base/solaris/native/libjvm_db/libjvm_db.c

*** 550,560 ****
    CHECK_FAIL(err);
    err = read_pointer(J, constantPool + nameIndex * POINTER_SIZE + SIZE_ConstantPool, &nameSymbol);
    CHECK_FAIL(err);
    // The symbol is a CPSlot and has lower bit set to indicate metadata
    nameSymbol &= (~1); // remove metadata lsb
!   err = ps_pread(J->P, nameSymbol + OFFSET_Symbol_length, &nameSymbolLength, 2);
    CHECK_FAIL(err);
    nameString = (char*)calloc(nameSymbolLength + 1, 1);
    err = ps_pread(J->P, nameSymbol + OFFSET_Symbol_body, nameString, nameSymbolLength);
    CHECK_FAIL(err);
  
--- 550,561 ----
    CHECK_FAIL(err);
    err = read_pointer(J, constantPool + nameIndex * POINTER_SIZE + SIZE_ConstantPool, &nameSymbol);
    CHECK_FAIL(err);
    // The symbol is a CPSlot and has lower bit set to indicate metadata
    nameSymbol &= (~1); // remove metadata lsb
!   // The length is in the top half of the word.
!   err = ps_pread(J->P, nameSymbol + OFFSET_Symbol_length_and_refcount, &nameSymbolLength, 2);
    CHECK_FAIL(err);
    nameString = (char*)calloc(nameSymbolLength + 1, 1);
    err = ps_pread(J->P, nameSymbol + OFFSET_Symbol_body, nameString, nameSymbolLength);
    CHECK_FAIL(err);
  
*** 562,583 ****
    err = ps_pread(J->P, constMethod + OFFSET_ConstMethod_signature_index, &signatureIndex, 2);
    CHECK_FAIL(err);
    err = read_pointer(J, constantPool + signatureIndex * POINTER_SIZE + SIZE_ConstantPool, &signatureSymbol);
    CHECK_FAIL(err);
    signatureSymbol &= (~1);  // remove metadata lsb
!   err = ps_pread(J->P, signatureSymbol + OFFSET_Symbol_length, &signatureSymbolLength, 2);
    CHECK_FAIL(err);
    signatureString = (char*)calloc(signatureSymbolLength + 1, 1);
    err = ps_pread(J->P, signatureSymbol + OFFSET_Symbol_body, signatureString, signatureSymbolLength);
    CHECK_FAIL(err);
  
    /* To get klass string */
    err = read_pointer(J, constantPool + OFFSET_ConstantPool_pool_holder, &klassPtr);
    CHECK_FAIL(err);
    err = read_pointer(J, klassPtr + OFFSET_Klass_name, &klassSymbol);
    CHECK_FAIL(err);
!   err = ps_pread(J->P, klassSymbol + OFFSET_Symbol_length, &klassSymbolLength, 2);
    CHECK_FAIL(err);
    klassString = (char*)calloc(klassSymbolLength + 1, 1);
    err = ps_pread(J->P, klassSymbol + OFFSET_Symbol_body, klassString, klassSymbolLength);
    CHECK_FAIL(err);
  
--- 563,584 ----
    err = ps_pread(J->P, constMethod + OFFSET_ConstMethod_signature_index, &signatureIndex, 2);
    CHECK_FAIL(err);
    err = read_pointer(J, constantPool + signatureIndex * POINTER_SIZE + SIZE_ConstantPool, &signatureSymbol);
    CHECK_FAIL(err);
    signatureSymbol &= (~1);  // remove metadata lsb
!   err = ps_pread(J->P, signatureSymbol + OFFSET_Symbol_length_and_refcount, &signatureSymbolLength, 2);
    CHECK_FAIL(err);
    signatureString = (char*)calloc(signatureSymbolLength + 1, 1);
    err = ps_pread(J->P, signatureSymbol + OFFSET_Symbol_body, signatureString, signatureSymbolLength);
    CHECK_FAIL(err);
  
    /* To get klass string */
    err = read_pointer(J, constantPool + OFFSET_ConstantPool_pool_holder, &klassPtr);
    CHECK_FAIL(err);
    err = read_pointer(J, klassPtr + OFFSET_Klass_name, &klassSymbol);
    CHECK_FAIL(err);
!   err = ps_pread(J->P, klassSymbol + OFFSET_Symbol_length_and_refcount, &klassSymbolLength, 2);
    CHECK_FAIL(err);
    klassString = (char*)calloc(klassSymbolLength + 1, 1);
    err = ps_pread(J->P, klassSymbol + OFFSET_Symbol_body, klassString, klassSymbolLength);
    CHECK_FAIL(err);