Fix for circular references detection in almost all cases, fixing https://bugs.launchpad.net/inkscape/+bug/167247 and a few of its duplicates.

This fix is aimed at preventing any sort of circular references with the URIReference::_acceptObject method, checking the absence of loops in the reference+child tree.

There can be some performance improvements done if we add a pointer from cloned sub-objects to their origin sub-object. 

The remaining cases that are not fixed can involve non-trivial loops using one or more "url()" stylesheet references. Being able to take them into account would require a non-obvious style.cpp refactoring making use of URIReference for this kind of reference (and not handling manually the signals in the styling code, which would probably be a good thing to do anyway)

(bzr r14245)

1 files changed, 1 insertions, 12 deletions

diff --git a/src/sp-use-reference.cpp b/src/sp-use-reference.cpp
index 642cfede8..f0b2985d2 100644
--- a/src/sp-use-reference.cpp
+++ b/src/sp-use-reference.cpp
@@ -25,18 +25,7 @@
 
 bool SPUseReference::_acceptObject(SPObject * const obj) const
 {
-    if (SP_IS_ITEM(obj)) {
-        SPObject * const owner = getOwner();
-        // Refuse references to us or to an ancestor.
-        for ( SPObject *iter = owner ; iter ; iter = iter->parent ) {
-            if ( iter == obj ) {
-                return false;
-            }
-        }
-        return true;
-    } else {
-        return false;
-    }
+	return URIReference::_acceptObject(obj);
 }