From 31660932a6ccaae6bc4f16c45f8f20e518159ae0 Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Tue, 26 Jan 2010 18:59:16 +0000 Subject: [PATCH] natClass.cc (registerClosure): Make sure closures is non NULL. 2010-01-26 Andrew Haley * java/lang/natClass.cc (registerClosure): Make sure closures is non NULL. From-SVN: r156257 --- libjava/ChangeLog | 5 +++++ libjava/java/lang/natClass.cc | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 37b8ec4aec2c..3a9b46263f64 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2010-01-26 Andrew Haley + + * java/lang/natClass.cc (registerClosure): Make sure closures is + non NULL. + 2010-01-19 Matthias Klose * Regenerate .class files. diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc index 5b141605f92f..fb7da4a86254 100644 --- a/libjava/java/lang/natClass.cc +++ b/libjava/java/lang/natClass.cc @@ -689,9 +689,12 @@ void _Jv_ClosureList::registerClosure (jclass klass, void *ptr) { _Jv_ClosureList **closures = klass->engine->get_closure_list (klass); - this->ptr = ptr; - this->next = *closures; - *closures = this; + if (closures) + { + this->ptr = ptr; + this->next = *closures; + *closures = this; + } } #endif