diff options
| author | bulia byak <buliabyak@gmail.com> | 2009-03-09 00:31:51 +0000 |
|---|---|---|
| committer | buliabyak <buliabyak@users.sourceforge.net> | 2009-03-09 00:31:51 +0000 |
| commit | dd7d1310f9edcf2e9407ff6dc11f587e5f545d20 (patch) | |
| tree | fad791e022eb768cd3a2ed475226bc1d0198483c /src/sp-use.cpp | |
| parent | fix crash when duplicating an orphaned clone (diff) | |
| download | inkscape-dd7d1310f9edcf2e9407ff6dc11f587e5f545d20.tar.gz inkscape-dd7d1310f9edcf2e9407ff6dc11f587e5f545d20.zip | |
suppress warnings caused by an orphaned clone, which is legit even if useless
(bzr r7445)
Diffstat (limited to 'src/sp-use.cpp')
| -rw-r--r-- | src/sp-use.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/sp-use.cpp b/src/sp-use.cpp index 990407f95..76930086c 100644 --- a/src/sp-use.cpp +++ b/src/sp-use.cpp @@ -388,10 +388,11 @@ SPItem * sp_use_root(SPUse *use) { SPObject *orig = use->child; - while (SP_IS_USE(orig)) { + while (orig && SP_IS_USE(orig)) { orig = SP_USE(orig)->child; } - g_return_val_if_fail(SP_IS_ITEM(orig), NULL); + if (!orig || !SP_IS_ITEM(orig)) + return NULL; return SP_ITEM(orig); } @@ -749,7 +750,8 @@ sp_use_snappoints(SPItem const *item, bool const target, SnapPointsWithType &p, SPUse *use = SP_USE(item); SPItem *root = sp_use_root(use); - g_return_if_fail(root); + if (!root) + return; SPItemClass const &item_class = *(SPItemClass const *) G_OBJECT_GET_CLASS(root); if (item_class.snappoints) { |