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

util: Make code a bit more secure

Browse Source 
- add some checks on functions return values
- use snprintf to avoid buffer overflow
This commit is contained in:
David Maciejak
2014-04-06 01:52:52 +02:00
committed by Carlos R. Mafra
parent 01478146f9
commit aed4d78e87
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
util/wmsetbg.c
View File

@@ -990,12 +990,16 @@ static noreturn void helperLoop(RContext * rc)
static void updateDomain(const char *domain, const char *key, const char *texture) static void updateDomain(const char *domain, const char *key, const char *texture)
{ {
int result;
char *program = "wdwrite"; char *program = "wdwrite";
/* here is a mem leak */ /* here is a mem leak */
system(wstrconcat("wdwrite ", result = system(wstrconcat("wdwrite ",
wstrconcat(domain, smooth ? " SmoothWorkspaceBack YES" : " SmoothWorkspaceBack NO"))); wstrconcat(domain, smooth ? " SmoothWorkspaceBack YES" : " SmoothWorkspaceBack NO")));
if (result == -1)
werror("error executing system command");
execlp(program, program, domain, key, texture, NULL); execlp(program, program, domain, key, texture, NULL);
wwarning("warning could not run \"%s\"", program); wwarning("warning could not run \"%s\"", program);
} }
@@ -1377,8 +1381,12 @@ int main(int argc, char **argv)
} }
if (helperMode) { if (helperMode) {
int result;
/* lower priority, so that it wont use all the CPU */ /* lower priority, so that it wont use all the CPU */
nice(15); result = nice(15);
if (result == -1)
wwarning("error could not nice process");
helperLoop(rc); helperLoop(rc);
} else { } else {
@@ -1387,8 +1395,7 @@ int main(int argc, char **argv)
if (!texture) { if (!texture) {
char *image_path = getFullPixmapPath(image_name); char *image_path = getFullPixmapPath(image_name);
snprintf(buffer, sizeof(buffer), "(%s, \"%s\", %s)", style, image_path, back_color);
sprintf(buffer, "(%s, \"%s\", %s)", style, image_path, back_color);
wfree(image_path); wfree(image_path);
texture = (char *)buffer; texture = (char *)buffer;
} }