From f1d0d71ee582fa75005b2c2fd242aaf5a5f72aeb Mon Sep 17 00:00:00 2001
From: Christian Hergert <chergert@redhat.com>
Date: Fri, 19 May 2023 17:07:29 -0700
Subject: [PATCH] libsysprof-analyze: ensure mounts are sorted by length

This matches what we did previously so that we find the closest mount
match first.
---
 .../sysprof-mount-namespace.c                 | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/libsysprof-analyze/sysprof-mount-namespace.c b/src/libsysprof-analyze/sysprof-mount-namespace.c
index d779b231..47534bc7 100644
--- a/src/libsysprof-analyze/sysprof-mount-namespace.c
+++ b/src/libsysprof-analyze/sysprof-mount-namespace.c
@@ -29,6 +29,7 @@ struct _SysprofMountNamespace
   GObject    parent_instance;
   GPtrArray *devices;
   GPtrArray *mounts;
+  guint      mounts_dirty : 1;
 };
 
 static GType
@@ -145,6 +146,8 @@ sysprof_mount_namespace_add_mount (SysprofMountNamespace *self,
   g_return_if_fail (SYSPROF_IS_MOUNT (mount));
 
   g_ptr_array_add (self->mounts, mount);
+
+  self->mounts_dirty = TRUE;
 }
 
 void
@@ -193,6 +196,23 @@ sysprof_mount_namespace_find_device (SysprofMountNamespace *self,
   return NULL;
 }
 
+static gint
+sort_by_length (gconstpointer a,
+                gconstpointer b)
+{
+  SysprofMount *mount_a = *(SysprofMount * const *)a;
+  SysprofMount *mount_b = *(SysprofMount * const *)b;
+  gsize alen = strlen (sysprof_mount_get_mount_point (mount_a));
+  gsize blen = strlen (sysprof_mount_get_mount_point (mount_b));
+
+  if (alen > blen)
+    return -1;
+  else if (blen > alen)
+    return 1;
+  else
+    return 0;
+}
+
 /**
  * sysprof_mount_namespace_translate:
  * @self: a #SysprofMountNamespace
@@ -217,6 +237,12 @@ sysprof_mount_namespace_translate (SysprofMountNamespace *self,
   g_return_val_if_fail (SYSPROF_IS_MOUNT_NAMESPACE (self), NULL);
   g_return_val_if_fail (file != NULL, NULL);
 
+  if (self->mounts_dirty)
+    {
+      g_ptr_array_sort (self->mounts, sort_by_length);
+      self->mounts_dirty = FALSE;
+    }
+
   strv = g_array_new (TRUE, FALSE, sizeof (char *));
 
   for (guint i = 0; i < self->mounts->len; i++)