diff options
| author | Kris De Gussem <kris.degussem@gmail.com> | 2011-10-22 16:19:13 +0000 |
|---|---|---|
| committer | Kris <Kris.De.Gussem@hotmail.com> | 2011-10-22 16:19:13 +0000 |
| commit | 8dfc25432f0c295a80b419206f48da043054dcd3 (patch) | |
| tree | 28ac1aaf10f0da9c55ad1808cf14466de58e82d4 | |
| parent | cppcheck (diff) | |
| download | inkscape-8dfc25432f0c295a80b419206f48da043054dcd3.tar.gz inkscape-8dfc25432f0c295a80b419206f48da043054dcd3.zip | |
cppcheck: variable initialisation / fix possible memory leak
(bzr r10688)
| -rw-r--r-- | src/gc-anchored.h | 2 | ||||
| -rw-r--r-- | src/preferences.cpp | 5 | ||||
| -rw-r--r-- | src/snapper.h | 2 | ||||
| -rw-r--r-- | src/version.h | 5 |
4 files changed, 11 insertions, 3 deletions
diff --git a/src/gc-anchored.h b/src/gc-anchored.h index b15d11f5d..ee277be25 100644 --- a/src/gc-anchored.h +++ b/src/gc-anchored.h @@ -63,7 +63,7 @@ protected: private: struct Anchor : public Managed<SCANNED, MANUAL> { - Anchor() : refcount(0) {} + Anchor() : refcount(0),base(NULL) {} Anchor(Anchored const *obj) : refcount(0) { base = Core::base(const_cast<Anchored *>(obj)); } diff --git a/src/preferences.cpp b/src/preferences.cpp index 444acfcac..f026e92cd 100644 --- a/src/preferences.cpp +++ b/src/preferences.cpp @@ -521,6 +521,7 @@ struct _ObserverData { Preferences::Observer::Observer(Glib::ustring const &path) : observed_path(path) { + _data = NULL; } Preferences::Observer::~Observer() @@ -600,6 +601,10 @@ void Preferences::addObserver(Observer &o) _ObserverData *priv_data = new _ObserverData; priv_data->_node = node; priv_data->_is_attr = !attr_key.empty(); + if (o._data) + { + delete o._data; + } o._data = static_cast<void*>(priv_data); _observer_map[&o] = new PrefNodeObserver(o, attr_key); diff --git a/src/snapper.h b/src/snapper.h index aabdfdfb6..f5fbd4fdc 100644 --- a/src/snapper.h +++ b/src/snapper.h @@ -39,7 +39,7 @@ namespace Inkscape class Snapper { public: - Snapper() {} + //Snapper() {} //does not seem to be used somewhere Snapper(SnapManager *sm, ::Geom::Coord const t); virtual ~Snapper() {} diff --git a/src/version.h b/src/version.h index c62063123..faa8c38b2 100644 --- a/src/version.h +++ b/src/version.h @@ -17,7 +17,10 @@ namespace Inkscape { struct Version { - Version() {} + Version() { + major = 0; + minor = 0; + } Version(unsigned mj, unsigned mn) { // somebody pollutes our namespace with major() and minor() // macros, so we can't use new-style initializers |