Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix memory corruption on error in parse_selector_schema #2484

Merged
merged 2 commits into from
Oct 6, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ast_def_macros.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class LocalOption {

#define NESTING_GUARD(name) \
LocalOption<size_t> cnt_##name(name, name + 1); \
if (nestings > MAX_NESTING) throw Exception::NestingLimitError(pstate); \
if (name > MAX_NESTING) throw Exception::NestingLimitError(pstate); \

#define ATTACH_OPERATIONS()\
virtual void perform(Operation<void>* op) { (*op)(this); }\
Expand Down
19 changes: 18 additions & 1 deletion src/eval.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1789,11 +1789,28 @@ namespace Sass {
Expression_Obj sel = s->contents()->perform(this);
std::string result_str(sel->to_string(ctx.c_options));
result_str = unquote(Util::rtrim(result_str));
Parser p = Parser::from_c_str(result_str.c_str(), ctx, s->pstate());
char* temp_cstr = sass_copy_c_string(result_str.c_str());
ctx.strings.push_back(temp_cstr); // attach to context
Parser p = Parser::from_c_str(temp_cstr, ctx, s->pstate());
p.last_media_block = s->media_block();
// a selector schema may or may not connect to parent?
bool chroot = s->connect_parent() == false;
Selector_List_Obj sl = p.parse_selector_list(chroot);
auto vec_str_rend = ctx.strings.rend();
auto vec_str_rbegin = ctx.strings.rbegin();
// remove the first item searching from the back
// we cannot assume our item is still the last one
// order is not important, so we can optimize this
auto it = std::find(vec_str_rbegin, vec_str_rend, temp_cstr);
// undefined behavior if not found!
if (it != vec_str_rend) {
// overwrite with last item
*it = ctx.strings.back();
// remove last one from vector
ctx.strings.pop_back();
// free temporary copy
free(temp_cstr);
}
flag_is_in_selector_schema.reset();
return operator()(sl);
}
Expand Down
2 changes: 1 addition & 1 deletion src/file.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ namespace Sass {
file.seekg(0, std::ios::beg);
file.read(contents, size);
contents[size+0] = '\0';
contents[size+0] = '\0';
contents[size+1] = '\0';
file.close();
}
#endif
Expand Down