isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use ferror() after fflush() to check the error status of the stdio

Browse Source 
stream we wrote to.
This commit is contained in:
Todd C. Miller
2016-05-14 18:48:20 -06:00
parent 6d63ed8a92
commit 578af5af4d
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/sudoers/iolog.c
View File

@@ -550,6 +550,7 @@ write_info_log(char *pathbuf, size_t len, struct iolog_details *details,
char * const *av; char * const *av;
FILE *fp; FILE *fp;
int fd; int fd;
bool rval;
debug_decl(write_info_log, SUDOERS_DEBUG_UTIL) debug_decl(write_info_log, SUDOERS_DEBUG_UTIL)
pathbuf[len] = '\0'; pathbuf[len] = '\0';
@@ -571,7 +572,11 @@ write_info_log(char *pathbuf, size_t len, struct iolog_details *details,
fputs(*av, fp); fputs(*av, fp);
} }
fputc('\n', fp); fputc('\n', fp);
debug_return_bool(fclose(fp) == 0); fflush(fp);
rval = !ferror(fp);
fclose(fp);
debug_return_bool(rval);
} }
static int static int

9
plugins/sudoers/visudo_json.c
View File

@@ -999,7 +999,7 @@ bool
export_sudoers(const char *sudoers_path, const char *export_path, export_sudoers(const char *sudoers_path, const char *export_path,
bool quiet, bool strict) bool quiet, bool strict)
{ {
bool ok = false, need_comma = false; bool rval = false, need_comma = false;
const int indent = 4; const int indent = 4;
FILE *export_fp = stdout; FILE *export_fp = stdout;
debug_decl(export_sudoers, SUDOERS_DEBUG_UTIL) debug_decl(export_sudoers, SUDOERS_DEBUG_UTIL)
@@ -1033,7 +1033,7 @@ export_sudoers(const char *sudoers_path, const char *export_path,
parse_error = true; parse_error = true;
errorfile = sudoers_path; errorfile = sudoers_path;
} }
ok = !parse_error; rval = !parse_error;
if (parse_error) { if (parse_error) {
if (!quiet) { if (!quiet) {
@@ -1062,7 +1062,10 @@ export_sudoers(const char *sudoers_path, const char *export_path,
fputs("\n}\n", export_fp); fputs("\n}\n", export_fp);
done: done:
(void)fflush(export_fp);
if (ferror(export_fp))
rval = false;
if (export_fp != stdout && export_fp != NULL) if (export_fp != stdout && export_fp != NULL)
fclose(export_fp); fclose(export_fp);
debug_return_bool(ok); debug_return_bool(rval);
} }