mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-02 22:05:44 +02:00
Code Issues Wiki Activity

Fix potential endless loops because of path.isEmpty()

Browse source
This commit is contained in:
Markus Schorn 2006-06-30 09:28:30 +00:00
parent 12e256794c
commit 948ad54c3a
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/PathUtil.java
View file

@ -7,6 +7,7 @@
* *
* Contributors: * Contributors:
* QNX Software Systems - initial API and implementation * QNX Software Systems - initial API and implementation
* Markus Schorn (Wind River Systems)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.core.browser; package org.eclipse.cdt.core.browser;
@ -136,7 +137,7 @@ public class PathUtil {
IWorkspaceRoot root = getWorkspaceRoot(); IWorkspaceRoot root = getWorkspaceRoot();
if (root != null) { if (root != null) {
IPath path = getWorkspaceRelativePath(fullPath); IPath path = getWorkspaceRelativePath(fullPath);
while (!path.isEmpty()) { while (path.segmentCount() > 0) {
IResource res = root.findMember(path); IResource res = root.findMember(path);
if (res != null) if (res != null)
return CoreModel.getDefault().create(res.getProject()); return CoreModel.getDefault().create(res.getProject());
@ -151,7 +152,7 @@ public class PathUtil {
IWorkspaceRoot root = getWorkspaceRoot(); IWorkspaceRoot root = getWorkspaceRoot();
if (root != null) { if (root != null) {
IPath path = getWorkspaceRelativePath(fullPath); IPath path = getWorkspaceRelativePath(fullPath);
while (!path.isEmpty()) { while (path.segmentCount() > 0) {
IResource res = root.findMember(path); IResource res = root.findMember(path);
if (res != null && res.exists() && (res.getType() == IResource.PROJECT || res.getType() == IResource.FOLDER)) if (res != null && res.exists() && (res.getType() == IResource.PROJECT || res.getType() == IResource.FOLDER))
return path; return path;

5
core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/PathUtil.java
View file

@ -7,6 +7,7 @@
* *
* Contributors: * Contributors:
* QNX Software Systems - initial API and implementation * QNX Software Systems - initial API and implementation
* Markus Schorn (Wind River Systems)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.utils; package org.eclipse.cdt.utils;
@ -134,7 +135,7 @@ public class PathUtil {
IWorkspaceRoot root = getWorkspaceRoot(); IWorkspaceRoot root = getWorkspaceRoot();
if (root != null) { if (root != null) {
IPath path = getWorkspaceRelativePath(fullPath); IPath path = getWorkspaceRelativePath(fullPath);
while (!path.isEmpty()) { while (path.segmentCount() > 0) {
IResource res = root.findMember(path); IResource res = root.findMember(path);
if (res != null) if (res != null)
return res.getProject(); return res.getProject();
@ -149,7 +150,7 @@ public class PathUtil {
IWorkspaceRoot root = getWorkspaceRoot(); IWorkspaceRoot root = getWorkspaceRoot();
if (root != null) { if (root != null) {
IPath path = getWorkspaceRelativePath(fullPath); IPath path = getWorkspaceRelativePath(fullPath);
while (!path.isEmpty()) { while (path.segmentCount() > 0) {
IResource res = root.findMember(path); IResource res = root.findMember(path);
if (res != null && res.exists() && (res.getType() == IResource.PROJECT || res.getType() == IResource.FOLDER)) if (res != null && res.exists() && (res.getType() == IResource.PROJECT || res.getType() == IResource.FOLDER))
return path; return path;