From c24e249051c06cfcef8a02bbb8986f01cdca9266 Mon Sep 17 00:00:00 2001
From: John Cortell <john.cortell@freescale.com>
Date: Wed, 7 Feb 2007 22:47:18 +0000
Subject: [PATCH] Assignment placed in incorrect block could lead to NPE.

---
 .../org/eclipse/cdt/debug/internal/core/model/CRegister.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegister.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegister.java
index 1b3f39f5f99..ec7393f75a6 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegister.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CRegister.java
@@ -369,8 +369,8 @@ public class CRegister extends CVariable implements IRegister {
 		for( int i = 0; i < events.length; i++ ) {
 			ICDIEvent event = events[i];
 			ICDIObject source = event.getSource();
-			ICDITarget cdiTarget = source.getTarget();
 			if (source != null) {
+				ICDITarget cdiTarget = source.getTarget();
 				if ( event instanceof ICDIResumedEvent ) {
 					if (  getCDITarget().equals( cdiTarget ) ) {
 						setChanged( false );