Skip to content

[static analysis] close lock file when no longer needed #38

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

Merged
dmuhamedagic merged 4 commits into from
May 19, 2016
Merged

[static analysis] close lock file when no longer needed #38

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6625eb3
Low: do_status: avoid shadowing the file-scope static variable
jnpkrn May 13, 2016
ba316a3
Low: do_status: first check for lock's fd from _lockfile
jnpkrn May 13, 2016
e6a35e3
Low: do_status: fix superfluous check for valid lock's fd
jnpkrn May 13, 2016
bdd2987
Low: do_status: close lock file when no longer needed
jnpkrn May 13, 2016
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
22 changes: 10 additions & 12 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1271,7 +1271,7 @@ static int set_procfs_val(const char *path, const char *val)
static int do_status(int type)
{
pid_t pid;
int rv, lock_fd, ret;
int rv, status_lock_fd, ret;
const char *reason = NULL;
char lockfile_data[1024], *cp;

Expand All @@ -1292,33 +1292,31 @@ static int do_status(int type)
}


rv = _lockfile(O_RDWR, &lock_fd, &pid);
if (rv == 0) {
reason = "PID file not locked.";
rv = _lockfile(O_RDWR, &status_lock_fd, &pid);
if (status_lock_fd == -1) {
reason = "No PID file.";
goto quit;
}
if (lock_fd == -1) {
reason = "No PID file.";
if (rv == 0) {
close(status_lock_fd);
reason = "PID file not locked.";
goto quit;
}

if (pid) {
fprintf(stdout, "booth_lockpid=%d ", pid);
fflush(stdout);
}


rv = read(lock_fd, lockfile_data, sizeof(lockfile_data) - 1);
rv = read(status_lock_fd, lockfile_data, sizeof(lockfile_data) - 1);
if (rv < 4) {
close(status_lock_fd);
reason = "Cannot read lockfile data.";
ret = PCMK_LSB_UNKNOWN_ERROR;
goto quit;

}
lockfile_data[rv] = 0;

if (lock_fd != -1)
close(lock_fd);
close(status_lock_fd);


/* Make sure it's only a single line */
Expand Down