diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2018-09-27 14:06:19 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2018-09-27 14:06:19 +0000 |
| commit | 8e8a246b1b9e069b6185d575ecd45347d1a0cede (patch) | |
| tree | 51ec674283c6b62134ceb40aeb2629b66c185a6c | |
| parent | fix crash with PNG/JPG command line argument (diff) | |
| parent | cppcheck: 2 memleaks + copypasta (diff) | |
| download | inkscape-8e8a246b1b9e069b6185d575ecd45347d1a0cede.tar.gz inkscape-8e8a246b1b9e069b6185d575ecd45347d1a0cede.zip | |
Merge branch 'cppcheck_memory' of gitlab.com:serval2412/inkscape
| -rw-r--r-- | src/live_effects/lpe-offset.cpp | 2 | ||||
| -rw-r--r-- | src/seltrans.cpp | 2 | ||||
| -rw-r--r-- | src/ui/dialog/styledialog.cpp | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/live_effects/lpe-offset.cpp b/src/live_effects/lpe-offset.cpp index aa72ef195..6fa9e095b 100644 --- a/src/live_effects/lpe-offset.cpp +++ b/src/live_effects/lpe-offset.cpp @@ -311,7 +311,7 @@ LPEOffset::doEffect_path(Geom::PathVector const & path_in) } } Geom::PathIntersectionGraph *pig_b = new Geom::PathIntersectionGraph(ret, re_painter); - if (pig && !ret.empty() && !re_painter.empty()) { + if (pig_b && !ret.empty() && !re_painter.empty()) { ret = pig_b->getUnion(); } return ret; diff --git a/src/seltrans.cpp b/src/seltrans.cpp index ce7c63b04..a970d50ab 100644 --- a/src/seltrans.cpp +++ b/src/seltrans.cpp @@ -1455,6 +1455,8 @@ void Inkscape::SelTrans::moveTo(Geom::Point const &xy, guint state) } } } + delete bb; + delete sn; } Geom::Affine const move((Geom::Translate(dxy))); diff --git a/src/ui/dialog/styledialog.cpp b/src/ui/dialog/styledialog.cpp index 2984ae11a..15f713591 100644 --- a/src/ui/dialog/styledialog.cpp +++ b/src/ui/dialog/styledialog.cpp @@ -925,6 +925,7 @@ void StyleDialog::_addSelector() result = textDialogPtr->run(); if (result != Gtk::RESPONSE_OK) { // Cancel, close dialog, etc. textDialogPtr->hide(); + delete textDialogPtr; return; } /** |