[gnome-control-center/gnome-3-34] region: Fix crash in keyboard layout population

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit 0f8e3f332c47e1f9bb336e320d4c5a6d9d762572
Author: Philip Chimento <philip endlessm com>
Date:   Thu Sep 12 00:18:34 2019 +0000

    region: Fix crash in keyboard layout population
    
    The previous code would crash if 'variants' was null and 'layouts' had
    more than one element in it.
    
    
    (cherry picked from commit 412472c16dcae02007a029e612ff6945b45f0a84)

 panels/region/cc-region-panel.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
index 39b1f9d7b..955d51fe2 100644
--- a/panels/region/cc-region-panel.c
+++ b/panels/region/cc-region-panel.c
@@ -1330,7 +1330,8 @@ add_input_sources_from_localed (CcRegionPanel *self)
                 n = 0;
 
         for (i = 0; i < n && layouts[i][0]; i++) {
-                g_autoptr(CcInputSourceXkb) source = cc_input_source_xkb_new (self->xkb_info, layouts[i], 
variants[i]);
+                const char *variant = variants ? variants[i] : NULL;
+                g_autoptr(CcInputSourceXkb) source = cc_input_source_xkb_new (self->xkb_info, layouts[i], 
variant);
                 add_input_row (self, CC_INPUT_SOURCE (source));
         }
         gtk_widget_set_visible (GTK_WIDGET (self->no_inputs_row), n == 0);