Merge branch 'fix-ghashtable-pretty-printer' into 'master'

gdb: Fix GHashTable pretty printer off-by-one error See merge request GNOME/glib!1218
2024-12-26 07:26:15 +01:00 · 2019-11-06 12:24:04 +00:00 · 2019-11-06 12:24:04 +00:00 · cc1b53f74e
commit cc1b53f74e
parent a4e12b62e9 9042326ffc
1 changed files with 6 additions and 3 deletions
--- a/glib/glib_gdb.py
+++ b/glib/glib_gdb.py
@ -124,7 +124,6 @@ class GHashPrinter:
                self.value = None
                return v
            while long(self.pos) < long(self.size):
-                self.pos = self.pos + 1
                if long (self.hashes[self.pos]) >= 2:
                    key = self.keys[self.pos]
                    val = self.values[self.pos]
@ -135,8 +134,12 @@ class GHashPrinter:
                    # Queue value for next result
                    self.value = ('[%dv]'% (self.pos), val)

-                    # Return key
-                    return ('[%dk]'% (self.pos), key)
+                    # Increment pos and return key
+                    key = ('[%dk]'% (self.pos), key)
+                    self.pos += 1
+                    return key
+
+                self.pos += 1
            raise StopIteration

        __next__ = next