public/gpu-screen-recorder
1
0
Fork 0
mirror of https://repo.dec05eba.com/gpu-screen-recorder synced 2026-03-31 09:07:13 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

Proper strncpy null termination

Browse Source
This commit is contained in:
dec05eba
2024-05-09 16:17:38 +02:00
parent 447b5d0f0b
commit f1eb893493
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kms/client/kms_client.c
View File

@@ -127,7 +127,7 @@ static bool create_socket_path(char *output_path, size_t output_path_size) {
return true; return true;
} }
static void strncpy_safe(char *dst, const char *src, int len) { static void string_copy(char *dst, const char *src, int len) {
int src_len = strlen(src); int src_len = strlen(src);
int min_len = src_len; int min_len = src_len;
if(len - 1 < min_len) if(len - 1 < min_len)
@@ -232,7 +232,7 @@ int gsr_kms_client_init(gsr_kms_client *self, const char *card_path) {
} }
local_addr.sun_family = AF_UNIX; local_addr.sun_family = AF_UNIX;
strncpy_safe(local_addr.sun_path, self->initial_socket_path, sizeof(local_addr.sun_path)); string_copy(local_addr.sun_path, self->initial_socket_path, sizeof(local_addr.sun_path));
const mode_t prev_mask = umask(0000); const mode_t prev_mask = umask(0000);
const int bind_res = bind(self->initial_socket_fd, (struct sockaddr*)&local_addr, sizeof(local_addr.sun_family) + strlen(local_addr.sun_path)); const int bind_res = bind(self->initial_socket_fd, (struct sockaddr*)&local_addr, sizeof(local_addr.sun_family) + strlen(local_addr.sun_path));

4
kms/server/kms_server.c
View File

@@ -379,7 +379,7 @@ static double clock_get_monotonic_seconds(void) {
return (double)ts.tv_sec + (double)ts.tv_nsec * 0.000000001; return (double)ts.tv_sec + (double)ts.tv_nsec * 0.000000001;
} }
static void strncpy_safe(char *dst, const char *src, int len) { static void string_copy(char *dst, const char *src, int len) {
int src_len = strlen(src); int src_len = strlen(src);
int min_len = src_len; int min_len = src_len;
if(len - 1 < min_len) if(len - 1 < min_len)
@@ -444,7 +444,7 @@ int main(int argc, char **argv) {
while(clock_get_monotonic_seconds() - start_time < connect_timeout_sec) { while(clock_get_monotonic_seconds() - start_time < connect_timeout_sec) {
struct sockaddr_un remote_addr = {0}; struct sockaddr_un remote_addr = {0};
remote_addr.sun_family = AF_UNIX; remote_addr.sun_family = AF_UNIX;
strncpy_safe(remote_addr.sun_path, domain_socket_path, sizeof(remote_addr.sun_path)); string_copy(remote_addr.sun_path, domain_socket_path, sizeof(remote_addr.sun_path));
// TODO: Check if parent disconnected // TODO: Check if parent disconnected
if(connect(socket_fd, (struct sockaddr*)&remote_addr, sizeof(remote_addr.sun_family) + strlen(remote_addr.sun_path)) == -1) { if(connect(socket_fd, (struct sockaddr*)&remote_addr, sizeof(remote_addr.sun_family) + strlen(remote_addr.sun_path)) == -1) {
if(errno == ECONNREFUSED || errno == ENOENT) { if(errno == ECONNREFUSED || errno == ENOENT) {

13
src/utils.c
View File

@@ -414,9 +414,18 @@ static bool try_card_has_valid_plane(const char *card_path) {
return false; return false;
} }
static void string_copy(char *dst, const char *src, int len) {
int src_len = strlen(src);
int min_len = src_len;
if(len - 1 < min_len)
min_len = len - 1;
memcpy(dst, src, min_len);
dst[min_len] = '\0';
}
bool gsr_get_valid_card_path(gsr_egl *egl, char *output) { bool gsr_get_valid_card_path(gsr_egl *egl, char *output) {
if(egl->dri_card_path) { if(egl->dri_card_path) {
strncpy(output, egl->dri_card_path, 127); string_copy(output, egl->dri_card_path, 127);
return try_card_has_valid_plane(output); return try_card_has_valid_plane(output);
} }
@@ -435,7 +444,7 @@ bool gsr_card_path_get_render_path(const char *card_path, char *render_path) {
char *render_path_tmp = drmGetRenderDeviceNameFromFd(fd); char *render_path_tmp = drmGetRenderDeviceNameFromFd(fd);
if(render_path_tmp) { if(render_path_tmp) {
strncpy(render_path, render_path_tmp, 127); string_copy(render_path, render_path_tmp, 127);
free(render_path_tmp); free(render_path_tmp);
close(fd); close(fd);
return true; return true;