From 2c27efbc0678bdb6b43ef8c4da6b2bd092803e44 Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Thu, 24 Apr 2003 15:41:38 +0000 Subject: [PATCH] Check for null pointer in 'isCharacter' and 'isCharPointer'. --- debug/org.eclipse.cdt.debug.core/ChangeLog | 4 ++++ .../org/eclipse/cdt/debug/internal/core/model/CValue.java | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog index e49dd412494..faa88ef6db2 100644 --- a/debug/org.eclipse.cdt.debug.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.core/ChangeLog @@ -1,3 +1,7 @@ +2003-04-23 Mikhail Khodjaiants + Check for null pointer in 'isCharacter' and 'isCharPointer'. + * CValue.java + 2003-04-23 Mikhail Khodjaiants Throw DebugException when getSignals() fails. * CSignalManager.java diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java index 6f4ae999715..3a6021eeed2 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CValue.java @@ -287,6 +287,7 @@ public class CValue extends CDebugElement implements ICValue String value = getUnderlyingValueString().trim(); if ( value != null ) { + value = value.trim(); return ( value.startsWith( "0x" ) && value.indexOf( ' ' ) != -1 ); } return false; @@ -294,10 +295,10 @@ public class CValue extends CDebugElement implements ICValue public boolean isCharacter() { - String value = getUnderlyingValueString().trim(); + String value = getUnderlyingValueString(); if ( value != null ) { - return ( value.endsWith( "\'" ) ); + return ( value.trim().endsWith( "\'" ) ); } return false; }