client/pool-buffer: set CLOEXEC on buffer FD, just in case

master
emersion 7 years ago
parent 2e6e7b7c1d
commit 8df2238956
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48

@ -1,37 +1,56 @@
#define _XOPEN_SOURCE 500 #define _XOPEN_SOURCE 500
#include <assert.h> #include <assert.h>
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include <fcntl.h>
#include <pango/pangocairo.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <pango/pangocairo.h>
#include <unistd.h> #include <unistd.h>
#include <wayland-client.h> #include <wayland-client.h>
#include "config.h" #include "config.h"
#include "pool-buffer.h" #include "pool-buffer.h"
static bool set_cloexec(int fd) {
long flags = fcntl(fd, F_GETFD);
if (flags == -1) {
return false;
}
if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) == -1) {
return false;
}
return true;
}
static int create_pool_file(size_t size, char **name) { static int create_pool_file(size_t size, char **name) {
static const char template[] = "sway-client-XXXXXX"; static const char template[] = "sway-client-XXXXXX";
const char *path = getenv("XDG_RUNTIME_DIR"); const char *path = getenv("XDG_RUNTIME_DIR");
if (!path) { if (path == NULL) {
fprintf(stderr, "XDG_RUNTIME_DIR is not set\n");
return -1; return -1;
} }
int ts = (path[strlen(path) - 1] == '/'); size_t name_size = strlen(template) + 1 + strlen(path) + 1;
*name = malloc(name_size);
*name = malloc( if (*name == NULL) {
strlen(template) + fprintf(stderr, "allocation failed\n");
strlen(path) + return -1;
(ts ? 0 : 1) + 1); }
sprintf(*name, "%s%s%s", path, ts ? "" : "/", template); snprintf(*name, name_size, "%s/%s", path, template);
int fd = mkstemp(*name); int fd = mkstemp(*name);
if (fd < 0) { if (fd < 0) {
return -1; return -1;
} }
if (!set_cloexec(fd)) {
close(fd);
return -1;
}
if (ftruncate(fd, size) < 0) { if (ftruncate(fd, size) < 0) {
close(fd); close(fd);
return -1; return -1;

Loading…
Cancel
Save