gmem.c (g_mem_chunk_area_compare): Fix 64-bitness bug in comparing two

gmem.c (g_mem_chunk_area_compare): Fix 64-bitness bug in comparing two pointers more than 4G apart.
2025-08-01 23:13:40 +02:00 · 2000-03-22 21:41:45 +00:00
parent 142219f278
commit 916d4db104
10 changed files with 42 additions and 2 deletions
--- a/4
+++ b/4
@@ -1,3 +1,7 @@
+2000-03-22 Elliot Lee <sopwith@redhat.com>
+	* gmem.c (g_mem_chunk_area_compare): Fix 64-bitness bug in comparing two pointers more
+	than 4G apart.
+
 2000-03-22  Tor Lillqvist  <tml@iki.fi>

 	* gutils.c: Move Win32-only includes after inclusion of glib.h, so
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+2000-03-22 Elliot Lee <sopwith@redhat.com>
+	* gmem.c (g_mem_chunk_area_compare): Fix 64-bitness bug in comparing two pointers more
+	than 4G apart.
+
 2000-03-22  Tor Lillqvist  <tml@iki.fi>

 	* gutils.c: Move Win32-only includes after inclusion of glib.h, so
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2000-03-22 Elliot Lee <sopwith@redhat.com>
+	* gmem.c (g_mem_chunk_area_compare): Fix 64-bitness bug in comparing two pointers more
+	than 4G apart.
+
 2000-03-22  Tor Lillqvist  <tml@iki.fi>

 	* gutils.c: Move Win32-only includes after inclusion of glib.h, so
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+2000-03-22 Elliot Lee <sopwith@redhat.com>
+	* gmem.c (g_mem_chunk_area_compare): Fix 64-bitness bug in comparing two pointers more
+	than 4G apart.
+
 2000-03-22  Tor Lillqvist  <tml@iki.fi>

 	* gutils.c: Move Win32-only includes after inclusion of glib.h, so
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+2000-03-22 Elliot Lee <sopwith@redhat.com>
+	* gmem.c (g_mem_chunk_area_compare): Fix 64-bitness bug in comparing two pointers more
+	than 4G apart.
+
 2000-03-22  Tor Lillqvist  <tml@iki.fi>

 	* gutils.c: Move Win32-only includes after inclusion of glib.h, so
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+2000-03-22 Elliot Lee <sopwith@redhat.com>
+	* gmem.c (g_mem_chunk_area_compare): Fix 64-bitness bug in comparing two pointers more
+	than 4G apart.
+
 2000-03-22  Tor Lillqvist  <tml@iki.fi>

 	* gutils.c: Move Win32-only includes after inclusion of glib.h, so
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2000-03-22 Elliot Lee <sopwith@redhat.com>
+	* gmem.c (g_mem_chunk_area_compare): Fix 64-bitness bug in comparing two pointers more
+	than 4G apart.
+
 2000-03-22  Tor Lillqvist  <tml@iki.fi>

 	* gutils.c: Move Win32-only includes after inclusion of glib.h, so
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2000-03-22 Elliot Lee <sopwith@redhat.com>
+	* gmem.c (g_mem_chunk_area_compare): Fix 64-bitness bug in comparing two pointers more
+	than 4G apart.
+
 2000-03-22  Tor Lillqvist  <tml@iki.fi>

 	* gutils.c: Move Win32-only includes after inclusion of glib.h, so
--- a/glib/gmem.c
+++ b/glib/gmem.c
@@ -931,7 +931,11 @@ static gint
 g_mem_chunk_area_compare (GMemArea *a,
 			  GMemArea *b)
 {
-  return (a->mem - b->mem);
+  if (a->mem > b->mem)
+	return 1;
+  else if (a->mem < b->mem)
+	return -1;
+  return 0;
 }

 static gint
--- a/gmem.c
+++ b/gmem.c
@@ -931,7 +931,11 @@ static gint
 g_mem_chunk_area_compare (GMemArea *a,
 			  GMemArea *b)
 {
-  return (a->mem - b->mem);
+  if (a->mem > b->mem)
+	return 1;
+  else if (a->mem < b->mem)
+	return -1;
+  return 0;
 }

 static gint