diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2014-04-05 09:26:51 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2014-04-05 09:26:51 +0000 |
| commit | 6f5f995b17f8eefd630c748f0fa57599830c1608 (patch) | |
| tree | 23042068c41cfca2a600e16daf625f327837f991 /src/text-editing.cpp | |
| parent | Revert the xml editor to it's dockable behaviour and add a comment for the pr... (diff) | |
| download | inkscape-6f5f995b17f8eefd630c748f0fa57599830c1608.tar.gz inkscape-6f5f995b17f8eefd630c748f0fa57599830c1608.zip | |
Prevent segfault when style string is null.
(bzr r13270)
Diffstat (limited to 'src/text-editing.cpp')
| -rw-r--r-- | src/text-editing.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/text-editing.cpp b/src/text-editing.cpp index cae123616..47964880c 100644 --- a/src/text-editing.cpp +++ b/src/text-editing.cpp @@ -776,7 +776,7 @@ sp_te_delete (SPItem *item, Inkscape::Text::Layout::iterator const &start, bool has_text_decoration = false; gchar const *root_style = (item)->getRepr()->attribute("style"); - if(strstr(root_style,"text-decoration"))has_text_decoration = true; + if(root_style && strstr(root_style,"text-decoration"))has_text_decoration = true; if (start_item == end_item) { // the quick case where we're deleting stuff all from the same string @@ -2035,7 +2035,7 @@ void sp_te_apply_style(SPItem *text, Inkscape::Text::Layout::iterator const &sta roundtrippability. */ bool has_text_decoration = false; gchar const *root_style = (text)->getRepr()->attribute("style"); - if(strstr(root_style,"text-decoration"))has_text_decoration = true; + if(root_style && strstr(root_style,"text-decoration")) has_text_decoration = true; while (tidy_xml_tree_recursively(common_ancestor, has_text_decoration)){}; // if we only modified subobjects this won't have been automatically sent |