This is an archive of the discontinued LLVM Phabricator instance.

[XRay] [compiler-rt] Plug a file descriptor leak in a failure case.
ClosedPublic

Authored by pelikan on Mar 22 2017, 11:58 PM.

Reviewers

Commits

Summary

Fd needs to be closed before the number gets out of scope.

LGTM

This revision is now accepted and ready to land.Mar 23 2017, 12:14 AM

This revision was automatically updated to reflect the committed changes.

Path

Size

compiler-rt/

trunk/

lib/

xray/

2 lines

Show All 38 Lines	static bool readValueFromFile(const char *Filename,
int Fd = open(Filename, O_RDONLY \| O_CLOEXEC);		int Fd = open(Filename, O_RDONLY \| O_CLOEXEC);
if (Fd == -1)		if (Fd == -1)
return false;		return false;
static constexpr size_t BufSize = 256;		static constexpr size_t BufSize = 256;
char Line[BufSize] = {};		char Line[BufSize] = {};
ssize_t BytesRead;		ssize_t BytesRead;
bool Success;		bool Success;
std::tie(BytesRead, Success) = retryingReadSome(Fd, Line, Line + BufSize);		std::tie(BytesRead, Success) = retryingReadSome(Fd, Line, Line + BufSize);
		close(Fd);
if (!Success)		if (!Success)
return false;		return false;
close(Fd);
char *End = nullptr;		char *End = nullptr;
long long Tmp = internal_simple_strtoll(Line, &End, 10);		long long Tmp = internal_simple_strtoll(Line, &End, 10);
bool Result = false;		bool Result = false;
if (Line[0] != '\0' && (End == '\n' \|\| End == '\0')) {		if (Line[0] != '\0' && (End == '\n' \|\| End == '\0')) {
*Value = Tmp;		*Value = Tmp;
Result = true;		Result = true;
}		}
return Result;		return Result;
▲ Show 20 Lines • Show All 163 Lines • Show Last 20 Lines