nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace scalloc + strncpy with sstrndup

This commit is contained in:
Orestis Floros 2019-03-30 13:20:32 +02:00
parent 8903f29795
commit ea6068a02d
No known key found for this signature in database
GPG Key ID: E9AD9F32E401E38F
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
i3-msg/main.c
View File

@ -77,8 +77,8 @@ static int reply_boolean_cb(void *params, int val) {
} }
static int reply_string_cb(void *params, const unsigned char *val, size_t len) { static int reply_string_cb(void *params, const unsigned char *val, size_t len) {
char *str = scalloc(len + 1, 1); char *str = sstrndup((const char *)val, len);
strncpy(str, (const char *)val, len);
if (strcmp(last_key, "error") == 0) if (strcmp(last_key, "error") == 0)
last_reply.error = str; last_reply.error = str;
else if (strcmp(last_key, "input") == 0) else if (strcmp(last_key, "input") == 0)
@ -108,8 +108,7 @@ static int reply_end_map_cb(void *params) {
static int reply_map_key_cb(void *params, const unsigned char *keyVal, size_t keyLen) { static int reply_map_key_cb(void *params, const unsigned char *keyVal, size_t keyLen) {
free(last_key); free(last_key);
last_key = scalloc(keyLen + 1, 1); last_key = sstrndup((const char *)keyVal, keyLen);
strncpy(last_key, (const char *)keyVal, keyLen);
return 1; return 1;
} }
@ -128,8 +127,7 @@ static yajl_callbacks reply_callbacks = {
static char *config_last_key = NULL; static char *config_last_key = NULL;
static int config_string_cb(void *params, const unsigned char *val, size_t len) { static int config_string_cb(void *params, const unsigned char *val, size_t len) {
char *str = scalloc(len + 1, 1); char *str = sstrndup((const char *)val, len);
strncpy(str, (const char *)val, len);
if (strcmp(config_last_key, "config") == 0) { if (strcmp(config_last_key, "config") == 0) {
fprintf(stdout, "%s", str); fprintf(stdout, "%s", str);
} }
@ -146,8 +144,7 @@ static int config_end_map_cb(void *params) {
} }
static int config_map_key_cb(void *params, const unsigned char *keyVal, size_t keyLen) { static int config_map_key_cb(void *params, const unsigned char *keyVal, size_t keyLen) {
config_last_key = scalloc(keyLen + 1, 1); config_last_key = sstrndup((const char *)keyVal, keyLen);
strncpy(config_last_key, (const char *)keyVal, keyLen);
return 1; return 1;
} }

5
src/ipc.c
View File

@ -215,12 +215,11 @@ void ipc_shutdown(shutdown_reason_t reason) {
IPC_HANDLER(run_command) { IPC_HANDLER(run_command) {
/* To get a properly terminated buffer, we copy /* To get a properly terminated buffer, we copy
* message_size bytes out of the buffer */ * message_size bytes out of the buffer */
char *command = scalloc(message_size + 1, 1); char *command = sstrndup((const char *)message, message_size);
strncpy(command, (const char *)message, message_size);
LOG("IPC: received: *%s*\n", command); LOG("IPC: received: *%s*\n", command);
yajl_gen gen = yajl_gen_alloc(NULL); yajl_gen gen = yajl_gen_alloc(NULL);
CommandResult *result = parse_command((const char *)command, gen); CommandResult *result = parse_command(command, gen);
free(command); free(command);
if (result->needs_tree_render) if (result->needs_tree_render)