Maarrk/tio
1
0
Fork 0
mirror of https://github.com/tio/tio.git synced 2026-05-01 14:57:59 +02:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions

Fix use of invalid flag with regexec()

Browse source
This commit is contained in:
Martin Lund 2024-05-03 09:19:21 +02:00
parent 62a4a93dec
commit 04dfa682c9
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/configfile.c
View file

@ -417,6 +417,7 @@ static char *match_and_replace(const char *str, const char *pattern, char *devic
char *string = malloc(strlen(device) + PATH_MAX); char *string = malloc(strlen(device) + PATH_MAX);
if (string == NULL) if (string == NULL)
{ {
tio_debug_printf("Failure allocating string memory\n");
return NULL; return NULL;
} }
strcpy(string, device); strcpy(string, device);
@ -434,11 +435,12 @@ static char *match_and_replace(const char *str, const char *pattern, char *devic
if (regcomp(&regex, pattern, REG_EXTENDED) != 0) if (regcomp(&regex, pattern, REG_EXTENDED) != 0)
{ {
// Failure to compile regular expression // Failure to compile regular expression
return NULL; tio_error_print("Failure compiling regular expression '%s'\n", pattern);
exit(EXIT_FAILURE);
} }
regmatch_t matches[regex.re_nsub + 1]; regmatch_t matches[regex.re_nsub + 1];
int status = regexec(&regex, str, regex.re_nsub + 1, matches, REG_EXTENDED); int status = regexec(&regex, str, regex.re_nsub + 1, matches, 0);
if (status == 0) if (status == 0)
{ {
tio_debug_printf("Full match: "); tio_debug_printf("Full match: ");
@ -469,13 +471,14 @@ static char *match_and_replace(const char *str, const char *pattern, char *devic
} }
else if (status == REG_NOMATCH) else if (status == REG_NOMATCH)
{ {
tio_debug_printf("No regex match\n");
goto error; goto error;
} }
else else
{ {
char error_message[100]; char error_message[100];
regerror(status, &regex, error_message, sizeof(error_message)); regerror(status, &regex, error_message, sizeof(error_message));
tio_error_print("Regex match failed: %s", error_message); tio_debug_printf("Regex match failed: %s", error_message);
goto error; goto error;
} }