[gnome-calculator] Check for the result of locale_to_utf8 (bgo#793098)



commit 9e58c585bd79ab3eb8afbe0d590a1439c92fe8de
Author: Robert Roth <robert roth off gmail com>
Date:   Thu Feb 1 20:15:48 2018 +0200

    Check for the result of locale_to_utf8 (bgo#793098)

 lib/serializer.vala |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/lib/serializer.vala b/lib/serializer.vala
index defb9c2..21bfee4 100644
--- a/lib/serializer.vala
+++ b/lib/serializer.vala
@@ -38,13 +38,23 @@ public class Serializer : Object
     public Serializer (DisplayFormat format, int number_base, int trailing_digits)
     {
         var radix_string = Posix.nl_langinfo (Posix.NLItem.RADIXCHAR);
-        if (radix_string != null && radix_string != "")
-            radix = radix_string.locale_to_utf8 (-1, null, null).get_char (0);
+        if (radix_string != null && radix_string != "") {
+            var radix_utf8 = radix_string.locale_to_utf8 (-1, null, null);
+            if (radix_utf8 != null)
+                radix = radix_utf8.get_char (0);
+            else
+                radix = '.';
+        }
         else
             radix = '.';
         var tsep_string = Posix.nl_langinfo (Posix.NLItem.THOUSEP);
-        if (tsep_string != null && tsep_string != "")
-            tsep = tsep_string.locale_to_utf8 (-1, null, null).get_char (0);
+        if (tsep_string != null && tsep_string != "") {
+            var tsep_utf8 = tsep_string.locale_to_utf8 (-1, null, null);
+            if (tsep_utf8 != null)
+                tsep = tsep_utf8.get_char (0);
+            else
+                tsep = ' ';
+        }
         else
             tsep = ' ';
         tsep_count = 3;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]