Skip to content

Commit cd4f9b6

Browse files
committed
Fix some minor resource leaks
1 parent 1f8c5a0 commit cd4f9b6

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

src/ast.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -961,13 +961,13 @@ namespace Sass {
961961

962962
// do some magic we inherit from node and extend
963963
Node node = subweave(lhsNode, rhsNode);
964-
Selector_List_Ptr result = SASS_MEMORY_NEW(Selector_List, pstate());
964+
Selector_List_Obj result = SASS_MEMORY_NEW(Selector_List, pstate());
965965
NodeDequePtr col = node.collection(); // move from collection to list
966966
for (NodeDeque::iterator it = col->begin(), end = col->end(); it != end; it++)
967967
{ result->append(nodeToComplexSelector(Node::naiveTrim(*it))); }
968968

969969
// only return if list has some entries
970-
return result->length() ? result : 0;
970+
return result->length() ? result.detach() : 0;
971971

972972
}
973973

src/parser.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ namespace Sass {
689689
Complex_Selector_Obj Parser::parse_complex_selector(bool chroot)
690690
{
691691

692-
String_Ptr reference = 0;
692+
String_Obj reference = 0;
693693
lex < block_comment >();
694694
advanceToNextToken();
695695
Complex_Selector_Obj sel = SASS_MEMORY_NEW(Complex_Selector, pstate);
@@ -911,8 +911,8 @@ namespace Sass {
911911
>()
912912
) {
913913
lex_css< alternatives < static_value, binomial > >();
914-
String_Constant_Ptr expr = SASS_MEMORY_NEW(String_Constant, pstate, lexed);
915-
if (expr && lex_css< exactly<')'> >()) {
914+
String_Constant_Obj expr = SASS_MEMORY_NEW(String_Constant, pstate, lexed);
915+
if (lex_css< exactly<')'> >()) {
916916
expr->can_compress_whitespace(true);
917917
return SASS_MEMORY_NEW(Pseudo_Selector, p, name, expr);
918918
}

src/source_map.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,14 @@ namespace Sass {
5454
}
5555
json_append_member(json_srcmap, "sources", json_sources);
5656

57-
if (include_sources) {
57+
if (include_sources && source_index.size()) {
5858
JsonNode *json_contents = json_mkarray();
5959
for (size_t i = 0; i < source_index.size(); ++i) {
6060
const Resource& resource(sources[source_index[i]]);
6161
JsonNode *json_content = json_mkstring(resource.contents);
6262
json_append_element(json_contents, json_content);
6363
}
64-
if (json_contents->children.head)
65-
json_append_member(json_srcmap, "sourcesContent", json_contents);
64+
json_append_member(json_srcmap, "sourcesContent", json_contents);
6665
}
6766

6867
JsonNode *json_names = json_mkarray();

0 commit comments

Comments
 (0)