src/share/vm/prims/jvmtiEnv.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 2018, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2003, 2019, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 1619,1628 ****
--- 1619,1635 ----
      if (k_oop == NULL) {
        return JVMTI_ERROR_INVALID_CLASS;
      }
    }
  
+   if (initial_object != NULL) {
+     oop init_obj = JNIHandles::resolve_external_guard(initial_object);
+     if (init_obj == NULL) {
+       return JVMTI_ERROR_INVALID_OBJECT;
+     }
+   }
+ 
    Thread *thread = Thread::current();
    HandleMark hm(thread);
    KlassHandle kh (thread, k_oop);
  
    TraceTime t("FollowReferences", TraceJVMTIObjectTagging);