Skip to content

Commit 0a0e440

Browse files
committed
feat(responseData/mergeAlias): prevent using subItem as fallback
This makes sure after merge, only non-alias sub item may be a symbol link. So `dereferenceSymbolLinks()` does not need to ensure if an item is an non-aliased item.
1 parent 3e6c2b0 commit 0a0e440

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

src/serverHandler/responseData.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -171,13 +171,7 @@ func (h *handler) mergeAlias(
171171
if isVirtual(subItem) {
172172
continue
173173
}
174-
var baseItem os.FileInfo
175-
if fsItem != nil {
176-
baseItem = fsItem
177-
} else {
178-
baseItem = subItem
179-
}
180-
aliasSubItem := createVirtualFileInfo(subItem.Name(), baseItem, aliasCaseSensitive)
174+
aliasSubItem := createVirtualFileInfo(subItem.Name(), fsItem, aliasCaseSensitive)
181175
aliasSubItems = append(aliasSubItems, aliasSubItem)
182176
subItems[i] = aliasSubItem
183177
if aliasCaseSensitive {

0 commit comments

Comments
 (0)