Escape vendor info for the monitor/layout configuration,

mtwebster · mtwebster · commit 917f13cf8b25 · 2023-06-06T21:54:30.000-04:00
don't call meta_monitor_spec_free() on a NULL pointer. Backported from: https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1685 Fixes #668.
diff --git a/src/backends/meta-monitor-config-manager.c b/src/backends/meta-monitor-config-manager.c
@@ -1521,11 +1521,12 @@ meta_monitor_config_manager_class_init (MetaMonitorConfigManagerClass *klass)
 void
 meta_monitor_config_free (MetaMonitorConfig *monitor_config)
 {
-  meta_monitor_spec_free (monitor_config->monitor_spec);
+  if (monitor_config->monitor_spec)
+    meta_monitor_spec_free (monitor_config->monitor_spec);
   g_free (monitor_config->mode_spec);
   g_free (monitor_config);
 }
-
+k
 void
 meta_logical_monitor_config_free (MetaLogicalMonitorConfig *logical_monitor_config)
 {
diff --git a/src/backends/meta-monitor-config-store.c b/src/backends/meta-monitor-config-store.c
@@ -1155,19 +1155,34 @@ append_monitor_spec (GString         *buffer,
                      MetaMonitorSpec *monitor_spec,
                      const char      *indentation)
 {
+  char *escaped;
+
   g_string_append_printf (buffer, "%s<monitorspec>\n", indentation);
+
+  escaped = g_markup_escape_text (monitor_spec->connector, -1);
   g_string_append_printf (buffer, "%s  <connector>%s</connector>\n",
                           indentation,
-                          monitor_spec->connector);
+                          escaped);
+  g_free (escaped);
+
+  escaped = g_markup_escape_text (monitor_spec->vendor, -1);
   g_string_append_printf (buffer, "%s  <vendor>%s</vendor>\n",
                           indentation,
-                          monitor_spec->vendor);
+                          escaped);
+  g_free (escaped);
+
+  escaped = g_markup_escape_text (monitor_spec->product, -1);
   g_string_append_printf (buffer, "%s  <product>%s</product>\n",
                           indentation,
-                          monitor_spec->product);
+                          escaped);
+  g_free (escaped);
+
+  escaped = g_markup_escape_text (monitor_spec->serial, -1);
   g_string_append_printf (buffer, "%s  <serial>%s</serial>\n",
                           indentation,
-                          monitor_spec->serial);
+                          escaped);
+  g_free (escaped);
+
   g_string_append_printf (buffer, "%s</monitorspec>\n", indentation);
 }
 
diff --git a/src/tests/migration/oneoff-new-finished.xml b/src/tests/migration/oneoff-new-finished.xml
@@ -8,7 +8,7 @@
       <monitor>
         <monitorspec>
           <connector>DP-1</connector>
-          <vendor>MetaProduct's Inc.</vendor>
+          <vendor>MetaProduct&apos;s Inc.</vendor>
           <product>MetaMonitor</product>
           <serial>0x123456</serial>
         </monitorspec>
@@ -22,7 +22,7 @@
     <disabled>
       <monitorspec>
         <connector>DP-2</connector>
-        <vendor>MetaProduct's Inc.</vendor>
+        <vendor>MetaProduct&apos;s Inc.</vendor>
         <product>MetaMonitor</product>
         <serial>0x654321</serial>
       </monitorspec>
diff --git a/src/tests/migration/oneoff-new.xml b/src/tests/migration/oneoff-new.xml
@@ -8,7 +8,7 @@
       <monitor>
         <monitorspec>
           <connector>DP-1</connector>
-          <vendor>MetaProduct's Inc.</vendor>
+          <vendor>MetaProduct&apos;s Inc.</vendor>
           <product>MetaMonitor</product>
           <serial>0x123456</serial>
         </monitorspec>
@@ -22,7 +22,7 @@
     <disabled>
       <monitorspec>
         <connector>DP-2</connector>
-        <vendor>MetaProduct's Inc.</vendor>
+        <vendor>MetaProduct&apos;s Inc.</vendor>
         <product>MetaMonitor</product>
         <serial>0x654321</serial>
       </monitorspec>
diff --git a/src/tests/migration/oneoff-old.xml b/src/tests/migration/oneoff-old.xml
@@ -2,7 +2,7 @@
   <configuration>
     <clone>no</clone>
     <output name="DP-1">
-      <vendor>MetaProduct's Inc.</vendor>
+      <vendor>MetaProduct&apos;s Inc.</vendor>
       <product>MetaMonitor</product>
       <serial>0x123456</serial>
       <width>800</width>
@@ -18,7 +18,7 @@
       <underscanning>no</underscanning>
     </output>
     <output name="DP-2">
-      <vendor>MetaProduct's Inc.</vendor>
+      <vendor>MetaProduct&apos;s Inc.</vendor>
       <product>MetaMonitor</product>
       <serial>0x654321</serial>
     </output>
diff --git a/src/tests/migration/rotated-new-finished.xml b/src/tests/migration/rotated-new-finished.xml
@@ -12,7 +12,7 @@
       <monitor>
         <monitorspec>
           <connector>DP-1</connector>
-          <vendor>MetaProduct's Inc.</vendor>
+          <vendor>MetaProduct&apos;s Inc.</vendor>
           <product>MetaMonitor</product>
           <serial>0x123456</serial>
         </monitorspec>
diff --git a/src/tests/migration/rotated-new.xml b/src/tests/migration/rotated-new.xml
@@ -12,7 +12,7 @@
       <monitor>
         <monitorspec>
           <connector>DP-1</connector>
-          <vendor>MetaProduct's Inc.</vendor>
+          <vendor>MetaProduct&apos;s Inc.</vendor>
           <product>MetaMonitor</product>
           <serial>0x123456</serial>
         </monitorspec>
diff --git a/src/tests/migration/rotated-old.xml b/src/tests/migration/rotated-old.xml
@@ -2,7 +2,7 @@
   <configuration>
     <clone>no</clone>
     <output name="DP-1">
-      <vendor>MetaProduct's Inc.</vendor>
+      <vendor>MetaProduct&apos;s Inc.</vendor>
       <product>MetaMonitor</product>
       <serial>0x123456</serial>
       <width>600</width>
diff --git a/src/tests/migration/wiggle-new-finished.xml b/src/tests/migration/wiggle-new-finished.xml
@@ -12,7 +12,7 @@
       <monitor>
         <monitorspec>
           <connector>DP-1</connector>
-          <vendor>MetaProduct's Inc.</vendor>
+          <vendor>MetaProduct&apos;s Inc.</vendor>
           <product>MetaMonitor</product>
           <serial>0x123456</serial>
         </monitorspec>
diff --git a/src/tests/migration/wiggle-new.xml b/src/tests/migration/wiggle-new.xml
@@ -12,7 +12,7 @@
       <monitor>
         <monitorspec>
           <connector>DP-1</connector>
-          <vendor>MetaProduct's Inc.</vendor>
+          <vendor>MetaProduct&apos;s Inc.</vendor>
           <product>MetaMonitor</product>
           <serial>0x123456</serial>
         </monitorspec>
diff --git a/src/tests/migration/wiggle-old.xml b/src/tests/migration/wiggle-old.xml
@@ -2,7 +2,7 @@
   <configuration>
     <clone>no</clone>
     <output name="DP-1">
-      <vendor>MetaProduct's Inc.</vendor>
+      <vendor>MetaProduct&apos;s Inc.</vendor>
       <product>MetaMonitor</product>
       <serial>0x123456</serial>
       <width>600</width>
diff --git a/src/tests/monitor-config-migration-unit-tests.c b/src/tests/monitor-config-migration-unit-tests.c
@@ -75,7 +75,7 @@ test_migration (const char *old_config,
   g_assert_nonnull (expected_data);
   g_assert_nonnull (migrated_data);
 
-  g_assert (strcmp (expected_data, migrated_data) == 0);
+  g_assert_cmpstr (expected_data, ==, migrated_data);
 
   migrated_file = g_file_new_for_path (migrated_path);
   if (!g_file_delete (migrated_file, NULL, &error))
diff --git a/src/tests/monitor-configs/first-rotated.xml b/src/tests/monitor-configs/first-rotated.xml
@@ -11,7 +11,7 @@
       <monitor>
 	<monitorspec>
 	  <connector>DP-1</connector>
-	  <vendor>MetaProduct's Inc.</vendor>
+     <vendor>MetaProduct&apos;s Inc.</vendor>
 	  <product>MetaMonitor</product>
 	  <serial>0x123456</serial>
 	</monitorspec>
@@ -32,7 +32,7 @@
       <monitor>
 	<monitorspec>
 	  <connector>DP-2</connector>
-	  <vendor>MetaProduct's Inc.</vendor>
+     <vendor>MetaProduct&apos;s Inc.</vendor>
 	  <product>MetaMonitor</product>
 	  <serial>0x123456</serial>
 	</monitorspec>
diff --git a/src/tests/monitor-configs/fractional-scale.xml b/src/tests/monitor-configs/fractional-scale.xml
@@ -8,7 +8,7 @@
       <monitor>
 	<monitorspec>
 	  <connector>DP-1</connector>
-	  <vendor>MetaProduct's Inc.</vendor>
+     <vendor>MetaProduct&apos;s Inc.</vendor>
 	  <product>MetaMonitor</product>
 	  <serial>0x123456</serial>
 	</monitorspec>
diff --git a/src/tests/monitor-configs/high-precision-fractional-scale.xml b/src/tests/monitor-configs/high-precision-fractional-scale.xml
@@ -8,7 +8,7 @@
       <monitor>
 	<monitorspec>
 	  <connector>DP-1</connector>
-	  <vendor>MetaProduct's Inc.</vendor>
+     <vendor>MetaProduct&apos;s Inc.</vendor>
 	  <product>MetaMonitor</product>
 	  <serial>0x123456</serial>
 	</monitorspec>
diff --git a/src/tests/monitor-configs/interlaced.xml b/src/tests/monitor-configs/interlaced.xml
@@ -7,7 +7,7 @@
       <monitor>
 	<monitorspec>
 	  <connector>DP-1</connector>
-	  <vendor>MetaProduct's Inc.</vendor>
+     <vendor>MetaProduct&apos;s Inc.</vendor>
 	  <product>MetaMonitor</product>
 	  <serial>0x123456</serial>
 	</monitorspec>
diff --git a/src/tests/monitor-configs/lid-scale.xml b/src/tests/monitor-configs/lid-scale.xml
@@ -8,7 +8,7 @@
       <monitor>
 	<monitorspec>
 	  <connector>eDP-1</connector>
-	  <vendor>MetaProduct's Inc.</vendor>
+     <vendor>MetaProduct&apos;s Inc.</vendor>
 	  <product>MetaMonitor</product>
 	  <serial>0x123456</serial>
 	</monitorspec>
diff --git a/src/tests/monitor-configs/lid-switch.xml b/src/tests/monitor-configs/lid-switch.xml
@@ -7,7 +7,7 @@
       <monitor>
 	<monitorspec>
 	  <connector>eDP-1</connector>
-	  <vendor>MetaProduct's Inc.</vendor>
+     <vendor>MetaProduct&apos;s Inc.</vendor>
 	  <product>MetaMonitor</product>
 	  <serial>0x123456</serial>
 	</monitorspec>
@@ -28,7 +28,7 @@
       <monitor>
 	<monitorspec>
 	  <connector>DP-1</connector>
-	  <vendor>MetaProduct's Inc.</vendor>
+     <vendor>MetaProduct&apos;s Inc.</vendor>
 	  <product>MetaMonitor</product>
 	  <serial>0x123456</serial>
 	</monitorspec>
@@ -52,7 +52,7 @@
       <monitor>
 	<monitorspec>
 	  <connector>DP-1</connector>
-	  <vendor>MetaProduct's Inc.</vendor>
+     <vendor>MetaProduct&apos;s Inc.</vendor>
 	  <product>MetaMonitor</product>
 	  <serial>0x123456</serial>
 	</monitorspec>
@@ -76,7 +76,7 @@
       <monitor>
 	<monitorspec>
 	  <connector>eDP-1</connector>
-	  <vendor>MetaProduct's Inc.</vendor>
+     <vendor>MetaProduct&apos;s Inc.</vendor>
 	  <product>MetaMonitor</product>
 	  <serial>0x123456</serial>
 	</monitorspec>
diff --git a/src/tests/monitor-configs/mirrored.xml b/src/tests/monitor-configs/mirrored.xml
@@ -7,7 +7,7 @@
       <monitor>
 	<monitorspec>
 	  <connector>DP-1</connector>
-	  <vendor>MetaProduct's Inc.</vendor>
+     <vendor>MetaProduct&apos;s Inc.</vendor>
 	  <product>MetaMonitor</product>
 	  <serial>0x123456</serial>
 	</monitorspec>
@@ -20,7 +20,7 @@
       <monitor>
 	<monitorspec>
 	  <connector>DP-2</connector>
-	  <vendor>MetaProduct's Inc.</vendor>
+     <vendor>MetaProduct&apos;s Inc.</vendor>
 	  <product>MetaMonitor</product>
 	  <serial>0x123456</serial>
 	</monitorspec>
diff --git a/src/tests/monitor-configs/non-preferred-tiled-custom-resolution.xml b/src/tests/monitor-configs/non-preferred-tiled-custom-resolution.xml
@@ -7,7 +7,7 @@
       <monitor>
        <monitorspec>
          <connector>DP-2</connector>
-         <vendor>MetaProduct's Inc.</vendor>
+         <vendor>MetaProduct&apos;s Inc.</vendor>
          <product>MetaMonitor</product>
          <serial>0x123456</serial>
        </monitorspec>
diff --git a/src/tests/monitor-configs/oneoff.xml b/src/tests/monitor-configs/oneoff.xml
@@ -8,7 +8,7 @@
       <monitor>
         <monitorspec>
           <connector>DP-1</connector>
-          <vendor>MetaProduct's Inc.</vendor>
+          <vendor>MetaProduct&apos;s Inc.</vendor>
           <product>MetaMonitor</product>
           <serial>0x123456</serial>
         </monitorspec>
@@ -22,7 +22,7 @@
     <disabled>
       <monitorspec>
 	<connector>DP-2</connector>
-	<vendor>MetaProduct's Inc.</vendor>
+   <vendor>MetaProduct&apos;s Inc.</vendor>
 	<product>MetaMonitor</product>
 	<serial>0x654321</serial>
       </monitorspec>
diff --git a/src/tests/monitor-configs/primary.xml b/src/tests/monitor-configs/primary.xml
@@ -7,7 +7,7 @@
       <monitor>
 	<monitorspec>
 	  <connector>DP-1</connector>
-	  <vendor>MetaProduct's Inc.</vendor>
+     <vendor>MetaProduct&apos;s Inc.</vendor>
 	  <product>MetaMonitor</product>
 	  <serial>0x123456</serial>
 	</monitorspec>
@@ -25,7 +25,7 @@
       <monitor>
 	<monitorspec>
 	  <connector>DP-2</connector>
-	  <vendor>MetaProduct's Inc.</vendor>
+     <vendor>MetaProduct&apos;s Inc.</vendor>
 	  <product>MetaMonitor</product>
 	  <serial>0x123456</serial>
 	</monitorspec>
diff --git a/src/tests/monitor-configs/scale.xml b/src/tests/monitor-configs/scale.xml
@@ -8,7 +8,7 @@
       <monitor>
 	<monitorspec>
 	  <connector>DP-1</connector>
-	  <vendor>MetaProduct's Inc.</vendor>
+     <vendor>MetaProduct&apos;s Inc.</vendor>
 	  <product>MetaMonitor</product>
 	  <serial>0x123456</serial>
 	</monitorspec>
diff --git a/src/tests/monitor-configs/second-rotated-tiled.xml b/src/tests/monitor-configs/second-rotated-tiled.xml
@@ -7,7 +7,7 @@
       <monitor>
 	<monitorspec>
 	  <connector>DP-1</connector>
-	  <vendor>MetaProduct's Inc.</vendor>
+     <vendor>MetaProduct&apos;s Inc.</vendor>
 	  <product>MetaMonitor</product>
 	  <serial>0x123456</serial>
 	</monitorspec>
@@ -28,7 +28,7 @@
       <monitor>
 	<monitorspec>
 	  <connector>DP-2</connector>
-	  <vendor>MetaProduct's Inc.</vendor>
+     <vendor>MetaProduct&apos;s Inc.</vendor>
 	  <product>MetaMonitor</product>
 	  <serial>0x123456</serial>
 	</monitorspec>
diff --git a/src/tests/monitor-configs/second-rotated.xml b/src/tests/monitor-configs/second-rotated.xml
@@ -7,7 +7,7 @@
       <monitor>
 	<monitorspec>
 	  <connector>DP-1</connector>
-	  <vendor>MetaProduct's Inc.</vendor>
+     <vendor>MetaProduct&apos;s Inc.</vendor>
 	  <product>MetaMonitor</product>
 	  <serial>0x123456</serial>
 	</monitorspec>
@@ -28,7 +28,7 @@
       <monitor>
 	<monitorspec>
 	  <connector>DP-2</connector>
-	  <vendor>MetaProduct's Inc.</vendor>
+     <vendor>MetaProduct&apos;s Inc.</vendor>
 	  <product>MetaMonitor</product>
 	  <serial>0x123456</serial>
 	</monitorspec>
diff --git a/src/tests/monitor-configs/single.xml b/src/tests/monitor-configs/single.xml
@@ -7,7 +7,7 @@
       <monitor>
 	<monitorspec>
 	  <connector>DP-1</connector>
-	  <vendor>MetaProduct's Inc.</vendor>
+     <vendor>MetaProduct&apos;s Inc.</vendor>
 	  <product>MetaMonitor</product>
 	  <serial>0x123456</serial>
 	</monitorspec>
diff --git a/src/tests/monitor-configs/tiled-custom-resolution.xml b/src/tests/monitor-configs/tiled-custom-resolution.xml
@@ -8,7 +8,7 @@
       <monitor>
 	<monitorspec>
 	  <connector>DP-1</connector>
-	  <vendor>MetaProduct's Inc.</vendor>
+     <vendor>MetaProduct&apos;s Inc.</vendor>
 	  <product>MetaMonitor</product>
 	  <serial>0x123456</serial>
 	</monitorspec>
diff --git a/src/tests/monitor-configs/tiled.xml b/src/tests/monitor-configs/tiled.xml
@@ -8,7 +8,7 @@
       <monitor>
 	<monitorspec>
 	  <connector>DP-1</connector>
-	  <vendor>MetaProduct's Inc.</vendor>
+     <vendor>MetaProduct&apos;s Inc.</vendor>
 	  <product>MetaMonitor</product>
 	  <serial>0x123456</serial>
 	</monitorspec>
diff --git a/src/tests/monitor-configs/underscanning.xml b/src/tests/monitor-configs/underscanning.xml
diff --git a/src/tests/monitor-configs/vertical.xml b/src/tests/monitor-configs/vertical.xml

Original file line number	Diff line number	Diff line change
`@@ -1521,11 +1521,12 @@ meta_monitor_config_manager_class_init (MetaMonitorConfigManagerClass *klass)`
`1521`	`1521`	`void`
`1522`	`1522`	`meta_monitor_config_free (MetaMonitorConfig *monitor_config)`
`1523`	`1523`	`{`
`1524`		`- meta_monitor_spec_free (monitor_config->monitor_spec);`
	`1524`	`+ if (monitor_config->monitor_spec)`
	`1525`	`+ meta_monitor_spec_free (monitor_config->monitor_spec);`
`1525`	`1526`	`g_free (monitor_config->mode_spec);`
`1526`	`1527`	`g_free (monitor_config);`
`1527`	`1528`	`}`
`1528`		`-`
	`1529`	`+k`
`1529`	`1530`	`void`
`1530`	`1531`	`meta_logical_monitor_config_free (MetaLogicalMonitorConfig *logical_monitor_config)`
`1531`	`1532`	`{`