fixes for style-test prefs crashes

diff --git a/src/Makefile.am b/src/Makefile.am
index c5d9138b9d85acb4480efec7d4508e439c289c0b..cda0a04fd521d7bf9acb75b126d8703c4da735c6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -194,6 +194,12 @@ TESTS =    \
        xml/quote-test$(EXEEXT) \
        xml/repr-action-test$(EXEEXT)
 
+# Amd64 failures??
+#XFAIL_TESTS = \
+#      test-all$(EXEEXT)       \
+#      style-test$(EXEEXT)     \
+#      svg/test-svg$(EXEEXT)
+
 # streamtest is unfinished and can't handle the relocations done during
 # "make distcheck".  Not needed for the 0.41 release.
 #      io/streamtest$(EXEEXT)

diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index d3cc1aa0064a3e748d5b78f15da76a9102e9c6ca..b7af482b2f87c583f9df51c593a8883c8109a993 100644 (file)
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -713,6 +713,7 @@ inkscape_get_repr (Inkscape::Application *inkscape, const gchar *key)
     }
 
     Inkscape::XML::Node *repr = sp_repr_document_root (Inkscape::Preferences::get());
+    if (!repr) return NULL;
     g_assert (!(strcmp (repr->name(), "inkscape")));
 
     gchar const *s = key;

diff --git a/src/style-test.cpp b/src/style-test.cpp
index 54be0040edfa2c1be17650d966e318410159bee6..5c123704b2c3c7af3473a2d555fc5150d116aa5f 100644 (file)
--- a/src/style-test.cpp
+++ b/src/style-test.cpp
@@ -619,6 +619,7 @@ test_style()
     utest_start("style");
     UTEST_TEST("sp_style_new, sp_style_write_string") {
         SPStyle *style = sp_style_new();
+        g_assert(style);
         gchar *str0_all = sp_style_write_string(style, SP_STYLE_FLAG_ALWAYS);
         gchar *str0_set = sp_style_write_string(style, SP_STYLE_FLAG_IFSET);
         UTEST_ASSERT(*str0_set == '\0');

diff --git a/src/xml/repr.h b/src/xml/repr.h
index dc96cb3e6435a71dbbd7a4cffe222b8fa8795d5a..f930ed0c52525c65017f648cd8a59513211cbdcb 100644 (file)
--- a/src/xml/repr.h
+++ b/src/xml/repr.h
@@ -143,11 +143,13 @@ Inkscape::XML::Document *sp_repr_document_new(gchar const *rootname);
 
 /// Returns root node of document.
 inline Inkscape::XML::Node *sp_repr_document_root(Inkscape::XML::Document const *doc) {
+    if (!doc) return NULL;
     return const_cast<Inkscape::XML::Node *>(doc->root());
 }
 
 /// Returns the node's document.
 inline Inkscape::XML::Document *sp_repr_document(Inkscape::XML::Node const *repr) {
+    if (!repr) return NULL;
     return const_cast<Inkscape::XML::Document *>(repr->document());
 }