Merge
authorkmo
Thu, 14 Mar 2013 16:17:58 -0700
changeset 16359 43372abd0c17
parent 15947 eadc31b7dd02 (diff)
parent 16358 ebf30634b326 (current diff)
child 16360 412be73af451
child 16365 011271eb4373
Merge
--- a/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	Thu Mar 14 13:22:04 2013 -0700
+++ b/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	Thu Mar 14 16:17:58 2013 -0700
@@ -516,7 +516,7 @@
         // here if the underlying file has been truncated.
         // Do not crash the VM in such a case.
         CodeBlob* cb = CodeCache::find_blob_unsafe(pc);
-        nmethod* nm = cb->is_nmethod() ? (nmethod*)cb : NULL;
+        nmethod* nm = (cb != NULL && cb->is_nmethod()) ? (nmethod*)cb : NULL;
         if (nm != NULL && nm->has_unsafe_access()) {
           stub = StubRoutines::handler_for_unsafe_access();
         }