sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Corrected copy of format_t objects

Browse source 
Copying of sub-elements was causing pointer overlap.
This commit is contained in:
John Wiegley 2012-03-05 05:02:11 -06:00
parent 3ea5d88eb3
commit 5abbf44583
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/format.cc
View file

@ -40,6 +40,17 @@ namespace ledger {
format_t::elision_style_t format_t::default_style = TRUNCATE_TRAILING; format_t::elision_style_t format_t::default_style = TRUNCATE_TRAILING;
bool format_t::default_style_changed = false; bool format_t::default_style_changed = false;
format_t::element_t::element_t(const element_t& elem)
: supports_flags<>(),
type(elem.type),
min_width(elem.min_width),
max_width(elem.max_width),
data(elem.data),
next(elem.next ? new element_t(*elem.next) : NULL)
{
TRACE_CTOR(element_t, "copy");
}
void format_t::element_t::dump(std::ostream& out) const void format_t::element_t::dump(std::ostream& out) const
{ {
out << "Element: "; out << "Element: ";

5
src/format.h
View file

@ -71,12 +71,11 @@ class format_t : public expr_base_t<string>
: supports_flags<>(), type(STRING), min_width(0), max_width(0) { : supports_flags<>(), type(STRING), min_width(0), max_width(0) {
TRACE_CTOR(element_t, ""); TRACE_CTOR(element_t, "");
} }
element_t(const element_t& elem);
~element_t() throw() { ~element_t() throw() {
TRACE_DTOR(element_t); TRACE_DTOR(element_t);
} }
element_t(const element_t& elem) : supports_flags<>() {
*this = elem;
}
element_t& operator=(const element_t& elem) { element_t& operator=(const element_t& elem) {
if (this != &elem) { if (this != &elem) {