Skip to content

fix: close XML file on parse-error paths to avoid FILE* leak #2247

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

Open
EylonKrause wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −3
Open

fix: close XML file on parse-error paths to avoid FILE* leak #2247

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
9 changes: 6 additions & 3 deletions src/graph/xml.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,9 @@ ncclResult_t ncclTopoDumpXmlToFile(const char* xmlTopoFile, struct ncclXml* xml)
INFO(NCCL_GRAPH | NCCL_ENV, "Unable to open %s, not dumping topology.", xmlTopoFile);
return ncclSuccess;
}
NCCLCHECK(ncclTopoDumpXmlRec(0, file, xml->nodes));
ncclResult_t res = ncclTopoDumpXmlRec(0, file, xml->nodes);
fclose(file);
NCCLCHECK(res);
return ncclSuccess;
}

Expand Down Expand Up @@ -418,8 +419,9 @@ ncclResult_t ncclTopoGetXmlFromFile(const char* xmlTopoFile, struct ncclXml* xml
INFO(NCCL_GRAPH, "Loading topology file %s", xmlTopoFile);
struct xmlHandler handlers[] = {{"system", ncclTopoXmlLoadSystem}};
xml->maxIndex = 0;
NCCLCHECK(xmlLoadSub(file, xml, NULL, handlers, 1));
ncclResult_t res = xmlLoadSub(file, xml, NULL, handlers, 1);
fclose(file);
NCCLCHECK(res);
#elif NCCL_OS_WINDOWS
(void)xmlTopoFile;
(void)xml;
Expand Down Expand Up @@ -1259,8 +1261,9 @@ ncclResult_t ncclTopoGetXmlGraphFromFile(const char* xmlGraphFile, struct ncclXm
}
struct xmlHandler handlers[] = {{"graphs", ncclTopoXmlGraphLoadGraphs}};
xml->maxIndex = 0;
NCCLCHECK(xmlLoadSub(file, xml, NULL, handlers, 1));
ncclResult_t res = xmlLoadSub(file, xml, NULL, handlers, 1);
fclose(file);
NCCLCHECK(res);
return ncclSuccess;
}

Expand Down