kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

dir.c: fix memory leak of glob with braces

Browse source 
join_path uses malloc. So free is required.
[Feature #13167]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64835 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shirosaki 2018-09-25 15:31:01 +00:00
parent 7ef91e62e2
commit b14325443a
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
dir.c
View file

@ -2055,11 +2055,12 @@ dirent_match_brace(const char *pattern, VALUE val, void *enc)
}
/* join paths from pattern list of glob_make_pattern() */
static const char*
static char*
join_path_from_pattern(struct glob_pattern **beg)
{
struct glob_pattern *p;
const char *path = "";
char *path = NULL;
size_t path_len;
for (p = *beg; p; p = p->next) {
const char *str;
@ -2070,7 +2071,23 @@ join_path_from_pattern(struct glob_pattern **beg)
default:
str = p->str;
}
path = join_path(path, strlen(path), (p != *beg), str, strlen(str));
if (!path) {
path_len = strlen(str);
path = GLOB_ALLOC_N(char, path_len + 1);
memcpy(path, str, path_len);
path[path_len] = '\0';
} else {
size_t len = strlen(str);
char *tmp;
tmp = GLOB_REALLOC(path, path_len + len + 2);
if (tmp) {
path = tmp;
path[path_len++] = '/';
memcpy(path + path_len, str, len);
path_len += len;
path[path_len] = '\0';
}
}
}
return path;
}
@ -2138,7 +2155,8 @@ glob_helper(
if (brace) {
struct push_glob_args args;
const char* brace_path = join_path_from_pattern(beg);
char* brace_path = join_path_from_pattern(beg);
if (!brace_path) return -1;
args.fd = fd;
args.path = path;
args.baselen = baselen;
@ -2147,7 +2165,9 @@ glob_helper(
args.flags = flags;
args.funcs = funcs;
args.arg = arg;
return ruby_brace_expand(brace_path, flags, push_caller, (VALUE)&args, enc, Qfalse);
status = ruby_brace_expand(brace_path, flags, push_caller, (VALUE)&args, enc, Qfalse);
GLOB_FREE(brace_path);
return status;
}
if (*path) {