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
commit 2ad0b349eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

View File

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