Fix findFileDef incorrectly flagging ambiguities

kartben · kartben · commit a13284e3f149 · 2025-07-09T23:02:46.000+02:00
Fix issues when comparing stripped paths due to improper handling of empty stripped paths. Fixes: #6178 Fixes: #11261 Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
diff --git a/src/util.cpp b/src/util.cpp
@@ -3474,7 +3474,9 @@ FileDef *findFileDef(const FileNameLinkedMap *fnMap,const QCString &n,bool &ambi
       {
         FileDef *fd = fd_p.get();
         QCString fdStripPath = stripFromIncludePath(fd->getPath());
-        if (path.isEmpty() || fdStripPath.right(pathStripped.length())==pathStripped)
+        if (path.isEmpty() ||
+            (!pathStripped.isEmpty() && fdStripPath.endsWith(pathStripped)) ||
+            (pathStripped.isEmpty() && fdStripPath.isEmpty()))
         {
           count++;
           lastMatch=fd;

Original file line number	Diff line number	Diff line change
`@@ -3474,7 +3474,9 @@ FileDef findFileDef(const FileNameLinkedMap fnMap,const QCString &n,bool &ambi`
`3474`	`3474`	`{`
`3475`	`3475`	`FileDef *fd = fd_p.get();`
`3476`	`3476`	`QCString fdStripPath = stripFromIncludePath(fd->getPath());`
`3477`		`- if (path.isEmpty() \|\| fdStripPath.right(pathStripped.length())==pathStripped)`
	`3477`	`+ if (path.isEmpty() \|\|`
	`3478`	`+ (!pathStripped.isEmpty() && fdStripPath.endsWith(pathStripped)) \|\|`
	`3479`	`+ (pathStripped.isEmpty() && fdStripPath.isEmpty()))`
`3478`	`3480`	`{`
`3479`	`3481`	`count++;`
`3480`	`3482`	`lastMatch=fd;`