Mercurial > hg > truffle

diff src/share/vm/oops/instanceKlass.hpp @ 8693:872b3feace55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8008750: [partfait] Null pointer deference in hotspot/src/share/vm/oops/instanceKlass.hpp Summary: fix null pointer Reviewed-by: kvn, coleenp
author morris
date Tue, 05 Mar 2013 18:03:36 -0800
parents 927a311d00f9
children 35ef86296a5d
line wrap: on
line diff
--- a/src/share/vm/oops/instanceKlass.hpp	Tue Mar 05 08:17:18 2013 -0800
+++ b/src/share/vm/oops/instanceKlass.hpp	Tue Mar 05 18:03:36 2013 -0800
@@ -536,7 +536,9 @@
     assert(is_anonymous(), "not anonymous");
     Klass** addr = (Klass**)adr_host_klass();
     assert(addr != NULL, "no reversed space");
-    *addr = host;
+    if (addr != NULL) {
+      *addr = host;
+    }
   }
   bool is_anonymous() const                {
     return (_misc_flags & _misc_is_anonymous) != 0;
@@ -758,7 +760,10 @@
   void set_implementor(Klass* k) {
     assert(is_interface(), "not interface");
     Klass** addr = adr_implementor();
-    *addr = k;
+    assert(addr != NULL, "null addr");
+    if (addr != NULL) {
+      *addr = k;
+    }
   }
 
   int  nof_implementors() const       {