diff options
| author | Dave Brolley <brolley@redhat.com> | 2008-08-14 12:39:43 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2008-08-14 12:39:43 -0400 |
| commit | a33ac7e8d41a9e195a4bad3c861fb2d3425fa5ca (patch) | |
| tree | 107d351e60ae098965c1fd04871e2d18dbf7f38a | |
| parent | b7afc05d1b544fe2c3ee130589b7464cd08c3c17 (diff) | |
| parent | ceaacb4ef6c696412b3acd5ee7ddf2f8376e12e5 (diff) | |
| download | systemtap-steved-a33ac7e8d41a9e195a4bad3c861fb2d3425fa5ca.tar.gz systemtap-steved-a33ac7e8d41a9e195a4bad3c861fb2d3425fa5ca.tar.xz systemtap-steved-a33ac7e8d41a9e195a4bad3c861fb2d3425fa5ca.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
| -rw-r--r-- | runtime/ChangeLog | 6 | ||||
| -rw-r--r-- | runtime/task_finder.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/runtime/ChangeLog b/runtime/ChangeLog index 7ec5d453..58678de5 100644 --- a/runtime/ChangeLog +++ b/runtime/ChangeLog @@ -1,3 +1,9 @@ +2008-08-14 Frank Ch. Eigler <fche@elastic.org> + + PR 6842. + * task_finder.c (__stp_utrace_task_finder_target_death): Tolerate + null tsk->signal. + 2008-08-12 David Smith <dsmith@redhat.com> PR 6445 (partial) diff --git a/runtime/task_finder.c b/runtime/task_finder.c index 26375780..928b7087 100644 --- a/runtime/task_finder.c +++ b/runtime/task_finder.c @@ -591,7 +591,7 @@ __stp_utrace_task_finder_target_death(struct utrace_attached_engine *engine, // Call the callback rc = tgt->callback(tsk, 0, - (atomic_read(&tsk->signal->live) == 0), + (tsk->signal == NULL) || (atomic_read(&tsk->signal->live) == 0), tgt); if (rc != 0) { _stp_error("death callback for %d failed: %d", |