alema/hkd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed memory access out of bound errors

Browse Source
This commit is contained in:
Alessandro Mauri 2021-02-09 19:34:23 +01:00
parent fb130ed809
commit 29bc56fc36
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hkd.c
View File

@ -64,6 +64,7 @@
#define array_size(val) (val ? sizeof(val)/sizeof(val[0]) : 0) #define array_size(val) (val ? sizeof(val)/sizeof(val[0]) : 0)
#define array_size_const(val) ((int)(sizeof(val)/sizeof(val[0]))) #define array_size_const(val) ((int)(sizeof(val)/sizeof(val[0])))
#define wrap_err(s) "[%s] " s, __func__ #define wrap_err(s) "[%s] " s, __func__
#define is_empty(s) (!(s) || !(s)[0])
#define EVENT_SIZE (sizeof(struct inotify_event)) #define EVENT_SIZE (sizeof(struct inotify_event))
#define EVENT_BUF_LEN (1024*(EVENT_SIZE+16)) #define EVENT_BUF_LEN (1024*(EVENT_SIZE+16))
@ -529,7 +530,7 @@ void hotkey_list_add (struct hotkey_list_e *head, union hotkey_main_data *dt, ch
{ {
int size; int size;
struct hotkey_list_e *tmp; struct hotkey_list_e *tmp;
if (!(size = strlen(cmd))) if (is_empty(cmd) || !(size = strlen(cmd)))
return; return;
if (!(tmp = malloc(sizeof(struct hotkey_list_e)))) if (!(tmp = malloc(sizeof(struct hotkey_list_e))))
die(wrap_err("Bad malloc:")); die(wrap_err("Bad malloc:"));
@ -736,10 +737,8 @@ void parse_config_file (void)
die(wrap_err("Keys is NULL")); die(wrap_err("Keys is NULL"));
i_tmp = strlen(keys); i_tmp = strlen(keys);
for (int i = 0; i < i_tmp; i++) { for (int i = 0; i < i_tmp; i++) {
if (isblank(keys[i])) { if (isblank(keys[i]))
memmove(&keys[i], &keys[i + 1], --i_tmp); memmove(&keys[i], &keys[i + 1], i_tmp - i);
keys[i_tmp] = '\0';
}
} }
cp_tmp = strtok(keys, ","); cp_tmp = strtok(keys, ",");
if(!cp_tmp) if(!cp_tmp)
@ -865,34 +864,39 @@ void usage (void)
/* replaces every instance of m(match) with r(eplace) inside of s */ /* replaces every instance of m(match) with r(eplace) inside of s */
void replace (char **s, const char *m, const char *r) void replace (char **s, const char *m, const char *r)
{ {
char **new_s = s; if (is_empty(s) || is_empty(*s) || is_empty(m) || is_empty(r))
int ms = strlen(m), rs = strlen(r); return;
char *t1;
int count = 0; int ms = strlen(m), rs = strlen(r);
int *offs = NULL, o = 0, *t2; int count = 0, o = 0;
int nss = strlen(*new_s); int *offs = NULL, *t2 = NULL;
while ((t1 = strstr(*new_s + o, m))) { char *t1 = NULL;
while ((t1 = strstr((*s) + o, m))) {
/* check if the match is surrounded by whitespace */ /* check if the match is surrounded by whitespace */
if ((t1[ms] == '\0' || isblank(t1[ms])) if ((t1[ms] == '\0' || isblank(t1[ms]))
&& isblank(t1 > *new_s ? *(t1 - 1) : ' ')) { && isblank(t1 > *s ? *(t1 - 1) : ' ')) {
if (!(t2 = realloc(offs, sizeof(int) * (count + 1)))) if (!(t2 = realloc(offs, sizeof(int) * (count + 1))))
die(wrap_err("Bad realloc:")); die(wrap_err("Bad realloc:"));
offs = t2; offs = t2;
offs[count] = (t1 - *new_s) + (rs - ms) * count; offs[count] = (t1 - *s) + (rs - ms) * count;
count++; count++;
} }
o = (t1 - *new_s) + 1; o = (t1 - *s) + 1;
} }
if (!offs)
return;
int nss = strlen(*s);
if ((rs - ms) > 0) { if ((rs - ms) > 0) {
if (!(t1 = realloc(*new_s, nss + (rs - ms) * count))) if (!(t1 = realloc(*s, nss + 1 + (rs - ms) * count)))
die(wrap_err("Bad realloc:")); die(wrap_err("Bad realloc:"));
*new_s = t1; *s = t1;
} }
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
char* x = *new_s + offs[i]; char* x = *s + offs[i];
int d = strlen(x) - ms; int d = strlen(x) - ms;
memmove(x + rs, x + ms, d); memmove(x + rs, x + ms, d);
memcpy(x, r, rs); memcpy(x, r, rs);