koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use sasprintf() instead of alloc'ing and strncpy() in i3bar.

Browse Source 
resolves #1995
This commit is contained in:
Ingo Bürk
2015-10-17 22:14:48 +02:00
parent 22b05f0073
commit 0750b450b2
5 changed files with 17 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
i3bar/src/mode.c
View File

@ -33,11 +33,7 @@ static int mode_string_cb(void *params_, const unsigned char *val, size_t len) {
struct mode_json_params *params = (struct mode_json_params *)params_;
if (!strcmp(params->cur_key, "change")) {
char *copy = smalloc(sizeof(const unsigned char) * (len + 1));
strncpy(copy, (const char *)val, len);
copy[len] = '\0';
params->name = copy;
sasprintf(&(params->name), "%.*s", len, val);
FREE(params->cur_key);
return 1;
}
@ -74,11 +70,7 @@ static int mode_boolean_cb(void *params_, int val) {
static int mode_map_key_cb(void *params_, const unsigned char *keyVal, size_t keyLen) {
struct mode_json_params *params = (struct mode_json_params *)params_;
FREE(params->cur_key);
params->cur_key = smalloc(sizeof(unsigned char) * (keyLen + 1));
strncpy(params->cur_key, (const char *)keyVal, keyLen);
params->cur_key[keyLen] = '\0';
sasprintf(&(params->cur_key), "%.*s", keyLen, keyVal);
return 1;
}