osama/dmenu
1
0
Fork 0
mirror of https://github.com/mintycube/dmenu.git synced 2024-10-22 12:05:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

free all allocated items, use %zu for size_t

Browse Source 
`items` itself is not checked for NULL as calling free on NULL is defined to be
a no-op.

ref. https://git.suckless.org/dmenu/commit/b43ec0577f2ad8ad33a0b893fe5360d966036786.html
This commit is contained in:
bakkeby 2022-03-28 11:15:46 +02:00
parent bb788aa0de
commit a1796e627d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dmenu.c
View File

@ -270,6 +270,9 @@ cleanup(void)
XUngrabKey(dpy, AnyKey, AnyModifier, root);
for (i = 0; i < SchemeLast; i++)
free(scheme[i]);
for (i = 0; items && items[i].text; ++i)
free(items[i].text);
free(items);
#if HIGHPRIORITY_PATCH
for (i = 0; i < hplength; ++i)
free(hpitems[i]);
@ -760,7 +763,7 @@ match(void)
/* separate input text into tokens to be matched individually */
for (s = strtok(buf, " "); s; tokv[tokc - 1] = s, s = strtok(NULL, " "))
if (++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv)))
die("cannot realloc %u bytes:", tokn * sizeof *tokv);
die("cannot realloc %zu bytes:", tokn * sizeof *tokv);
len = tokc ? strlen(tokv[0]) : 0;
#if PREFIXCOMPLETION_PATCH
@ -1377,7 +1380,7 @@ readstdin(void)
#else
if (i + 1 >= size / sizeof *items)
if (!(items = realloc(items, (size += BUFSIZ))))
die("cannot realloc %u bytes:", size);
die("cannot realloc %zu bytes:", size);
#endif // JSON_PATCH
if ((p = strchr(buf, '\n')))
*p = '\0';
@ -1386,12 +1389,12 @@ readstdin(void)
#else
if (!(items[i].text = strdup(buf)))
#endif // JSON_PATCH
die("cannot strdup %u bytes:", strlen(buf) + 1);
die("cannot strdup %zu bytes:", strlen(buf) + 1);
#if TSV_PATCH
if ((p = strchr(buf, '\t')))
*p = '\0';
if (!(items[i].stext = strdup(buf)))
die("cannot strdup %u bytes:", strlen(buf) + 1);
die("cannot strdup %zu bytes:", strlen(buf) + 1);
#endif // TSV_PATCH
#if MULTI_SELECTION_PATCH
items[i].id = i; /* for multiselect */