Merge pull request #162 from bendardenne/master
#161 Fix 'padded' array can be used outside its scope
This commit is contained in:
commit
2ad0b349eb
4
i3lock.c
4
i3lock.c
|
@ -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);
|
||||||
|
|
Loading…
Reference in New Issue