Skip to content

nss_cache: fix fd leaks #87

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
kmjohansen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

nss_cache: fix fd leaks #87

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
33 changes: 25 additions & 8 deletions nss_cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ enum nss_status _nss_cache_bsearch2(struct nss_cache_args *args, int *errnop) {

if (fseek(system_file_stream, offset, SEEK_SET) != 0) {
DEBUG("fseek fail\n");
fclose(system_file_stream);
return NSS_STATUS_UNAVAIL;
}

Expand Down Expand Up @@ -253,8 +254,12 @@ static enum nss_cache_match _nss_cache_pwnam_wrap(FILE *file,
// Internal setup routine

static enum nss_status _nss_cache_setpwent_locked(void) {
DEBUG("%s %s\n", "Opening", pw_filename);
pw_file = fopen(pw_filename, "r");
if (pw_file == NULL) {
DEBUG("%s %s\n", "Opening", pw_filename);
pw_file = fopen(pw_filename, "r");
} else {
rewind(pw_file);
}

if (pw_file) {
return NSS_STATUS_SUCCESS;
Expand Down Expand Up @@ -468,8 +473,12 @@ extern char *_nss_cache_setgrent_path(const char *path) {
// Internal setup routine

static enum nss_status _nss_cache_setgrent_locked(void) {
DEBUG("%s %s\n", "Opening", gr_filename);
gr_file = fopen(gr_filename, "r");
if (gr_file == NULL) {
DEBUG("%s %s\n", "Opening", gr_filename);
gr_file = fopen(gr_filename, "r");
} else {
rewind(gr_file);
}

if (gr_file) {
return NSS_STATUS_SUCCESS;
Expand Down Expand Up @@ -757,8 +766,12 @@ extern char *_nss_cache_setspent_path(const char *path) {
// Internal setup routine

static enum nss_status _nss_cache_setspent_locked(void) {
DEBUG("%s %s\n", "Opening", sp_filename);
sp_file = fopen(sp_filename, "r");
if (sp_file == NULL) {
DEBUG("%s %s\n", "Opening", sp_filename);
sp_file = fopen(sp_filename, "r");
} else {
rewind(sp_file);
}

if (sp_file) {
return NSS_STATUS_SUCCESS;
Expand Down Expand Up @@ -942,8 +955,12 @@ extern char *_nss_cache_setsgent_path(const char *path) {
// Internal setup routine

static enum nss_status _nss_cache_setsgent_locked(void) {
DEBUG("%s %s\n", "Opening", sg_filename);
sg_file = fopen(sg_filename, "r");
if (sg_file == NULL) {
DEBUG("%s %s\n", "Opening", sg_filename);
sg_file = fopen(sg_filename, "r");
} else {
rewind(sg_file);
}

if (sg_file) {
return NSS_STATUS_SUCCESS;
Expand Down