aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradlertz <unknown>2014-02-26 07:46:46 +0100
committerbell-sw <liberica@bell-sw.com>2020-01-19 09:12:34 +0300
commit53e94004ddd60b55a7b3ffd5f3aee44368b021d8 (patch)
tree9d2721968e1f4529c1d1bd7350fa7baf3e6ede16
parent2bd0d2e8aeb50ffb5f25ec5a2557ff07d9788127 (diff)
downloadjdk8u_hotspot-53e94004ddd60b55a7b3ffd5f3aee44368b021d8.tar.gz
8010500: [parfait] Possible null pointer dereference at hotspot/src/share/vm/opto/loopnode.hpp
Summary: Added NULL check for loopnode() in get_pre_loop_end() Reviewed-by: kvn, roland
-rw-r--r--src/share/vm/opto/superword.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/share/vm/opto/superword.cpp b/src/share/vm/opto/superword.cpp
index 718f077d0..e24d67f1d 100644
--- a/src/share/vm/opto/superword.cpp
+++ b/src/share/vm/opto/superword.cpp
@@ -448,6 +448,7 @@ bool SuperWord::ref_is_alignable(SWPointer& p) {
return true; // no induction variable
}
CountedLoopEndNode* pre_end = get_pre_loop_end(lp()->as_CountedLoop());
+ assert(pre_end != NULL, "we must have a correct pre-loop");
assert(pre_end->stride_is_con(), "pre loop stride is constant");
int preloop_stride = pre_end->stride_con();
@@ -2052,7 +2053,7 @@ void SuperWord::align_initial_loop_index(MemNode* align_to_ref) {
CountedLoopNode *main_head = lp()->as_CountedLoop();
assert(main_head->is_main_loop(), "");
CountedLoopEndNode* pre_end = get_pre_loop_end(main_head);
- assert(pre_end != NULL, "");
+ assert(pre_end != NULL, "we must have a correct pre-loop");
Node *pre_opaq1 = pre_end->limit();
assert(pre_opaq1->Opcode() == Op_Opaque1, "");
Opaque1Node *pre_opaq = (Opaque1Node*)pre_opaq1;
@@ -2216,7 +2217,8 @@ CountedLoopEndNode* SuperWord::get_pre_loop_end(CountedLoopNode *cl) {
if (!p_f->is_IfFalse()) return NULL;
if (!p_f->in(0)->is_CountedLoopEnd()) return NULL;
CountedLoopEndNode *pre_end = p_f->in(0)->as_CountedLoopEnd();
- if (!pre_end->loopnode()->is_pre_loop()) return NULL;
+ CountedLoopNode* loop_node = pre_end->loopnode();
+ if (loop_node == NULL || !loop_node->is_pre_loop()) return NULL;
return pre_end;
}