diff options
-rw-r--r-- | src/modules/module-default-device-restore.c | 8 | ||||
-rw-r--r-- | src/pulsecore/authkey.c | 5 | ||||
-rw-r--r-- | src/pulsecore/core-util.c | 7 |
3 files changed, 12 insertions, 8 deletions
diff --git a/src/modules/module-default-device-restore.c b/src/modules/module-default-device-restore.c index 94f589e9..0c4aea33 100644 --- a/src/modules/module-default-device-restore.c +++ b/src/modules/module-default-device-restore.c @@ -64,8 +64,8 @@ static void load(struct userdata *u) { char ln[256] = ""; pa_sink *s; - (void) fgets(ln, sizeof(ln)-1, f); - pa_strip_nl(ln); + if (fgets(ln, sizeof(ln)-1, f)) + pa_strip_nl(ln); fclose(f); if (!ln[0]) @@ -85,8 +85,8 @@ static void load(struct userdata *u) { char ln[256] = ""; pa_source *s; - (void) fgets(ln, sizeof(ln)-1, f); - pa_strip_nl(ln); + if (fgets(ln, sizeof(ln)-1, f)) + pa_strip_nl(ln); fclose(f); if (!ln[0]) diff --git a/src/pulsecore/authkey.c b/src/pulsecore/authkey.c index 92509d89..a590a65e 100644 --- a/src/pulsecore/authkey.c +++ b/src/pulsecore/authkey.c @@ -55,7 +55,10 @@ static int generate(int fd, void *ret_data, size_t length) { pa_random(ret_data, length); lseek(fd, (off_t) 0, SEEK_SET); - (void) ftruncate(fd, (off_t) 0); + if (ftruncate(fd, (off_t) 0) < 0) { + pa_log("Failed to truncate cookie file: %s", pa_cstrerror(errno)); + return -1; + } if ((r = pa_loop_write(fd, ret_data, length, NULL)) < 0 || (size_t) r != length) { pa_log("Failed to write cookie file: %s", pa_cstrerror(errno)); diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c index b5043a38..13d0bb5e 100644 --- a/src/pulsecore/core-util.c +++ b/src/pulsecore/core-util.c @@ -259,11 +259,12 @@ int pa_make_secure_dir(const char* dir, mode_t m, uid_t uid, gid_t gid) { } #ifdef HAVE_FCHOWN - if (uid == (uid_t)-1) + if (uid == (uid_t) -1) uid = getuid(); - if (gid == (gid_t)-1) + if (gid == (gid_t) -1) gid = getgid(); - (void) fchown(fd, uid, gid); + if (fchown(fd, uid, gid) < 0) + goto fail; #endif #ifdef HAVE_FCHMOD |