mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2025-08-07 15:47:01 +02:00
[BUG] acl: fd leak when reading patterns from file
The fd is not closed after patterns have successfully been read from a file. Bug reported by Bertrand Jacquin. Should be backported to 1.4.
This commit is contained in:
parent
9d9ed0113b
commit
6a8097f034
@ -1059,6 +1059,7 @@ static int acl_read_patterns_from_file( struct acl_keyword *aclkw,
|
||||
const char *args[2];
|
||||
struct acl_pattern *pattern;
|
||||
int opaque;
|
||||
int ret = 0;
|
||||
|
||||
file = fopen(filename, "r");
|
||||
if (!file)
|
||||
@ -1119,15 +1120,14 @@ static int acl_read_patterns_from_file( struct acl_keyword *aclkw,
|
||||
pattern = NULL; /* get a new one */
|
||||
}
|
||||
}
|
||||
if (pattern)
|
||||
free_pattern(pattern);
|
||||
return 1;
|
||||
|
||||
ret = 1; /* success */
|
||||
|
||||
out_free_pattern:
|
||||
free_pattern(pattern);
|
||||
out_close:
|
||||
fclose(file);
|
||||
return 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Parse an ACL expression starting at <args>[0], and return it.
|
||||
|
Loading…
Reference in New Issue
Block a user