Skip to content

Commit 864db89

Browse files
committed
Fix some possibly uninitialized values
1 parent cd4f9b6 commit 864db89

File tree

3 files changed

+20
-7
lines changed

3 files changed

+20
-7
lines changed

src/ast.hpp

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -358,8 +358,11 @@ namespace Sass {
358358
void reset_duplicate_key() { duplicate_key_ = 0; }
359359
virtual void adjust_after_pushing(std::pair<Expression_Obj, Expression_Obj> p) { }
360360
public:
361-
Hashed(size_t s = 0) : elements_(ExpressionMap(s)), list_(std::vector<Expression_Obj>())
362-
{ elements_.reserve(s); list_.reserve(s); reset_duplicate_key(); }
361+
Hashed(size_t s = 0)
362+
: elements_(ExpressionMap(s)),
363+
list_(std::vector<Expression_Obj>()),
364+
hash_(0), duplicate_key_(NULL)
365+
{ elements_.reserve(s); list_.reserve(s); }
363366
virtual ~Hashed();
364367
size_t length() const { return list_.size(); }
365368
bool empty() const { return list_.empty(); }
@@ -1036,9 +1039,13 @@ namespace Sass {
10361039
class Content : public Statement {
10371040
ADD_PROPERTY(Media_Block_Ptr, media_block)
10381041
public:
1039-
Content(ParserState pstate) : Statement(pstate)
1042+
Content(ParserState pstate)
1043+
: Statement(pstate),
1044+
media_block_(NULL)
10401045
{ statement_type(CONTENT); }
1041-
Content(const Content* ptr) : Statement(ptr)
1046+
Content(const Content* ptr)
1047+
: Statement(ptr),
1048+
media_block_(ptr->media_block_)
10421049
{ statement_type(CONTENT); }
10431050
ATTACH_AST_OPERATIONS(Content)
10441051
ATTACH_OPERATIONS()
@@ -2326,13 +2333,15 @@ namespace Sass {
23262333
: AST_Node(pstate),
23272334
contents_(c),
23282335
connect_parent_(true),
2329-
media_block_(NULL)
2336+
media_block_(NULL),
2337+
hash_(0)
23302338
{ }
23312339
Selector_Schema(const Selector_Schema* ptr)
23322340
: AST_Node(ptr),
23332341
contents_(ptr->contents_),
23342342
connect_parent_(ptr->connect_parent_),
2335-
media_block_(ptr->media_block_)
2343+
media_block_(ptr->media_block_),
2344+
hash_(ptr->hash_)
23362345
{ }
23372346
virtual bool has_parent_ref() const;
23382347
virtual bool has_real_parent_ref() const;

src/b64/encode.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ namespace base64
2424

2525
encoder(int buffersize_in = BUFFERSIZE)
2626
: _buffersize(buffersize_in)
27-
{}
27+
{
28+
base64_init_encodestate(&_state);
29+
}
2830

2931
int encode(char value_in)
3032
{

src/context.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ namespace Sass {
7272
sheets(),
7373
subset_map(),
7474
import_stack(),
75+
callee_stack(),
76+
c_compiler(NULL),
7577

7678
c_headers (std::vector<Sass_Importer_Entry>()),
7779
c_importers (std::vector<Sass_Importer_Entry>()),

0 commit comments

Comments
 (0)