From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10788 invoked by alias); 17 Jan 2008 19:42:22 -0000 Received: (qmail 10763 invoked by uid 9519); 17 Jan 2008 19:42:22 -0000 Date: Thu, 17 Jan 2008 19:42:00 -0000 Message-ID: <20080117194222.10748.qmail@sourceware.org> From: rmoseley@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Handle null return from getIsa. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 0658ba9ba71969deabd233d212bbb59046220f4d X-Git-Newrev: 86fc26f68c285f6f5740351cfffea9cbb96733c4 Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q1/txt/msg00081.txt.bz2 The branch, master has been updated via 86fc26f68c285f6f5740351cfffea9cbb96733c4 (commit) from 0658ba9ba71969deabd233d212bbb59046220f4d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 86fc26f68c285f6f5740351cfffea9cbb96733c4 Author: Rick Moseley Date: Thu Jan 17 13:41:44 2008 -0600 Handle null return from getIsa. * LinuxPtraceTaskState.java: Handle null ISA return. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/proc/live/ChangeLog | 1 + .../frysk/proc/live/LinuxPtraceTaskState.java | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog index da4b78e..2888dee 100644 --- a/frysk-core/frysk/proc/live/ChangeLog +++ b/frysk-core/frysk/proc/live/ChangeLog @@ -1,6 +1,7 @@ 2008-01-17 Rick Moseley * LinuxWaitBuilder.java: Catch error when process is gone. + * LinuxPtraceTaskState.java: Handle null ISA return. 2008-01-17 Andrew Cagney diff --git a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java index dc58ffd..e861a87 100644 --- a/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java +++ b/frysk-core/frysk/proc/live/LinuxPtraceTaskState.java @@ -996,7 +996,7 @@ class LinuxPtraceTaskState extends State { // first step onto the first instruction of a just started // task sometimes doesn't set the right task stepped flag. // So we check and immediately clear here. - if (isa.isTaskStepped(task) || task.justStartedXXX) + if (isa != null && (isa.isTaskStepped(task) || task.justStartedXXX)) { if (task.justStartedXXX) return stepping.handleTrappedEvent(task); hooks/post-receive -- frysk system monitor/debugger