mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 14:42:11 +02:00
Code Issues Wiki Activity

[305667] Possible NPE in CSourceFinder (applied patch)

Browse source
This commit is contained in:
John Cortell 2010-03-12 13:49:01 +00:00
parent ce38a4facd
commit 83736061cd
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/srcfinder/CSourceFinder.java
View file

@ -119,7 +119,7 @@ public class CSourceFinder implements ISourceFinder, ILaunchConfigurationListene
ILaunch[] launches = lmgr.getLaunches(); ILaunch[] launches = lmgr.getLaunches();
for (ILaunch launch : launches) { for (ILaunch launch : launches) {
ILaunchConfiguration config = launch.getLaunchConfiguration(); ILaunchConfiguration config = launch.getLaunchConfiguration();
if (isMatch(config)) { if (config != null && isMatch(config)) {
ISourceLocator launchLocator = launch.getSourceLocator(); ISourceLocator launchLocator = launch.getSourceLocator();
// in practice, a launch locator is always an ISourceLookupDirector // in practice, a launch locator is always an ISourceLookupDirector
if (launchLocator instanceof ISourceLookupDirector) { if (launchLocator instanceof ISourceLookupDirector) {
@ -373,7 +373,8 @@ public class CSourceFinder implements ISourceFinder, ILaunchConfigurationListene
// searching using an inactive launch configuration's locator, then the // searching using an inactive launch configuration's locator, then the
// new launch's locator should take precedence // new launch's locator should take precedence
for (ILaunch launch : launches) { for (ILaunch launch : launches) {
if (isMatch(launch.getLaunchConfiguration())) { ILaunchConfiguration config = launch.getLaunchConfiguration();
if (config != null && isMatch(config)) {
fLaunchLocator = null; fLaunchLocator = null;
} }
} }