PolytreeDE
/
i3lock-color
mirror of https://github.com/Raymo111/i3lock-color.git
1
0
Fork 0
Code Releases Activity

Merge pull request #162 from bendardenne/master 

#161 Fix 'padded' array can be used outside its scope
This commit is contained in:
Raymond Li 2020-05-18 14:02:51 -04:00 committed by GitHub
parent 195fa4a7f2 0ea7fe0885
commit 2ad0b349eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
i3lock.c
View File

@ -1500,13 +1500,13 @@ int main(int argc, char *argv[]) {
char *optstring = "hvnbdc:p:ui:tCeI:frsS:kB:m"; char *optstring = "hvnbdc:p:ui:tCeI:frsS:kB:m";
char *arg = NULL; char *arg = NULL;
int opt = 0; int opt = 0;
char padded[9] = "ffffffff"; \
#define parse_color(acolor)\ #define parse_color(acolor)\
arg = optarg;\ arg = optarg;\
if (arg[0] == '#') arg++;\ if (arg[0] == '#') arg++;\
if (strlen(arg) == 6) {\ if (strlen(arg) == 6) {\
/* If 6 digits given, assume RGB and pad 0xff for alpha */\ /* If 6 digits given, assume RGB and pad 0xff for alpha */\
char padded[9] = "ffffffff"; \
strncpy( padded, arg, 6 );\ strncpy( padded, arg, 6 );\
arg = padded;\ arg = padded;\
}\ }\
@ -1589,7 +1589,7 @@ int main(int argc, char *argv[]) {
// Begin colors // Begin colors
case 'c': case 'c':
parse_color(color); parse_color(color);
break; break;
case 300: case 300:
parse_color(insidevercolor); parse_color(insidevercolor);