summaryrefslogtreecommitdiffstats
path: root/src/sp-use.cpp
diff options
context:
space:
mode:
authorDenis Declara <declara91@gmail.com>2012-05-05 13:32:42 +0000
committerDenis Declara <declara91@gmail.com>2012-05-05 13:32:42 +0000
commitaeb9c1bde66de096910757abb17dedb94ad74207 (patch)
treec0adf97685b0fa8af1553b14d20601f280492762 /src/sp-use.cpp
parentFixed some math, so that the objects now line up correctly (diff)
parentAdding checks to prevent null pointer dereferences (diff)
downloadinkscape-aeb9c1bde66de096910757abb17dedb94ad74207.tar.gz
inkscape-aeb9c1bde66de096910757abb17dedb94ad74207.zip
Trunk merge
(bzr r11073.1.29)
Diffstat (limited to 'src/sp-use.cpp')
-rw-r--r--src/sp-use.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/sp-use.cpp b/src/sp-use.cpp
index 5bbb1c1a8..e39f560c3 100644
--- a/src/sp-use.cpp
+++ b/src/sp-use.cpp
@@ -741,10 +741,14 @@ SPItem *sp_use_unlink(SPUse *use)
return item;
}
-SPItem *
-sp_use_get_original(SPUse *use)
+SPItem *sp_use_get_original(SPUse *use)
{
- SPItem *ref = use->ref->getObject();
+ SPItem *ref = NULL;
+ if (use){
+ if (use->ref){
+ ref = use->ref->getObject();
+ }
+ }
return ref;
}