gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00
Code Issues Projects Releases Wiki Activity

wmaker: fixes in function 'UnescapeWM_CLASS' (Coverity #50101, #50186, #50187)

Browse Source 
As coverity found a number of problem in the code, a few changes are made
to the function:
 - allocate better sizes for the strings (the original code allocated too
much room in many cases and missed the room for the final '\0' in a case)
 - do not free strings if empty anymore (the actual check was not correct
anyway), but avoid allocating in first place if it is not necessary.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
Signed-off-by: Carlos R. Mafra <crmafra@gmail.com>
This commit is contained in:
Christophe CURIS
2014-11-15 19:40:51 +01:00
committed by Carlos R. Mafra
parent ac3212b001
commit d726eaf617
1 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/misc.c
View File

@@ -862,16 +862,14 @@ char *EscapeWM_CLASS(const char *name, const char *class)
static void UnescapeWM_CLASS(const char *str, char **name, char **class) static void UnescapeWM_CLASS(const char *str, char **name, char **class)
{ {
int i, j, k, dot; int i, j, k, dot;
int length_of_name;
j = strlen(str); j = strlen(str);
*name = wmalloc(j);
**name = 0;
*class = wmalloc(j);
**class = 0;
/* separate string in 2 parts */ /* separate string in 2 parts */
length_of_name = 0;
dot = -1; dot = -1;
for (i = 0; i < j; i++) { for (i = 0; i < j; i++, length_of_name++) {
if (str[i] == '\\') { if (str[i] == '\\') {
i++; i++;
continue; continue;
@@ -881,31 +879,27 @@ static void UnescapeWM_CLASS(const char *str, char **name, char **class)
} }
} }
/* unescape strings */ /* unescape the name */
for (i = 0, k = 0; i < dot; i++) { if (length_of_name > 0) {
if (str[i] == '\\') { *name = wmalloc(length_of_name + 1);
continue; for (i = 0, k = 0; i < dot; i++) {
} else { if (str[i] != '\\')
(*name)[k++] = str[i]; (*name)[k++] = str[i];
} }
} (*name)[k] = '\0';
(*name)[k] = 0; } else {
for (i = dot + 1, k = 0; i < j; i++) {
if (str[i] == '\\') {
continue;
} else {
(*class)[k++] = str[i];
}
}
(*class)[k] = 0;
if (!*name) {
wfree(*name);
*name = NULL; *name = NULL;
} }
if (!*class) {
wfree(*class); /* unescape the class */
if (dot < j-1) {
*class = wmalloc(j - (dot + 1) + 1);
for (i = dot + 1, k = 0; i < j; i++) {
if (str[i] != '\\')
(*class)[k++] = str[i];
}
(*class)[k] = 0;
} else {
*class = NULL; *class = NULL;
} }
} }