diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2018-04-03 12:21:27 +0000 |
|---|---|---|
| committer | Tavmjong Bah <tavmjong@free.fr> | 2018-04-03 12:21:27 +0000 |
| commit | 0f9c0930952bdcdde19c8d0656e53a24d0bc8d53 (patch) | |
| tree | 6b2ef29cd9381fc40af83e95621c73cf49bbb89b /src | |
| parent | Code cleanup: remove unneeded file. (diff) | |
| download | inkscape-0f9c0930952bdcdde19c8d0656e53a24d0bc8d53.tar.gz inkscape-0f9c0930952bdcdde19c8d0656e53a24d0bc8d53.zip | |
Fix crash when selection non-variation style.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libnrtype/font-lister.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libnrtype/font-lister.cpp b/src/libnrtype/font-lister.cpp index e32dda063..e363ac7f8 100644 --- a/src/libnrtype/font-lister.cpp +++ b/src/libnrtype/font-lister.cpp @@ -766,11 +766,12 @@ void FontLister::fill_css(SPCSSAttr *css, Glib::ustring fontspec) // Convert Pango variations string to CSS format const char* str = pango_font_description_get_variations(desc); - std::string variations; + if (str) { - std::vector<Glib::ustring> tokens = Glib::Regex::split_simple(",", str); + std::string variations; + + std::vector<Glib::ustring> tokens = Glib::Regex::split_simple(",", str); - if (str) { Glib::RefPtr<Glib::Regex> regex = Glib::Regex::create("(\\w{4})=([-+]?\\d*\\.?\\d+([eE][-+]?\\d+)?)"); Glib::MatchInfo matchInfo; for (auto token: tokens) { |