From 0f9c0930952bdcdde19c8d0656e53a24d0bc8d53 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Tue, 3 Apr 2018 14:21:27 +0200
Subject: Fix crash when selection non-variation style.

---
 src/libnrtype/font-lister.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/libnrtype')

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) {
-- 
cgit v1.2.3