Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPCC-31416 CDistributedSuperFile::querySubFile may return incorrect subfile #18385

Merged
merged 1 commit into from
Mar 22, 2024
Merged

HPCC-31416 CDistributedSuperFile::querySubFile may return incorrect subfile #18385

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions dali/base/dadfs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6271,22 +6271,27 @@ class CDistributedSuperFile: public CDistributedFileBase<IDistributedSuperFile>
virtual IDistributedFile &querySubFile(unsigned idx,bool sub) override
{
CriticalBlock block (sect);
if (sub) {
ForEachItemIn(i,subfiles) {
if (sub)
{
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

trivial: formatting change, now inconsistent with other existing code below.
This style is preferred, but if changing, need to make the rest of the function consistently use it.

unsigned subfilen = idx;
ForEachItemIn(i,subfiles)
{
IDistributedFile &f=subfiles.item(i);
IDistributedSuperFile *super = f.querySuperFile();
if (super) {
if (super)
{
unsigned ns = super->numSubFiles(true);
if (ns>idx)
return super->querySubFile(idx,true);
idx -= ns;
if (ns>subfilen)
return super->querySubFile(subfilen,true);
subfilen -= ns;
}
else if (idx--==0)
else if (subfilen--==0)
return f;
}
// fall through to error
throw makeStringExceptionV(-1,"CDistributedSuperFile::querySubFile(%u) for superfile %s - subfile doesn't exist ", idx, logicalName.get());
}
return subfiles.item(idx);
else
return subfiles.item(idx);
}

virtual IDistributedFile *querySubFileNamed(const char *name, bool sub) override
Expand Down
Loading