luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-13 07:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed size in g_memmove, reported by Alexander Larsson

Browse Source 
1998-12-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* garray.c (g_ptr_array_remove_index): Fixed size in g_memmove,
	reported by Alexander Larsson <alla@lysator.liu.se>.

	* gmem.c: Fixed bug, that made compile fail for -DENABLE_MEM_PROFILE.
This commit is contained in:
Sebastian Wilhelmi 1998-12-17 08:02:38 +00:00 committed by Sebastian Wilhelmi
parent d9fca59e2a
commit c3c1b2edc0
12 changed files with 70 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
1998-12-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* garray.c (g_ptr_array_remove_index): Fixed size in g_memmove,
reported by Alexander Larsson <alla@lysator.liu.se>.
* gmem.c: Fixed bug, that made compile fail for -DENABLE_MEM_PROFILE.
Wed Dec 16 23:04:26 CST 1998 Shawn T. Amundson <amundson@gtk.org> Wed Dec 16 23:04:26 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* Released GLib 1.1.9 * Released GLib 1.1.9

7
ChangeLog.pre-2-0
View File

@ -1,3 +1,10 @@
1998-12-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* garray.c (g_ptr_array_remove_index): Fixed size in g_memmove,
reported by Alexander Larsson <alla@lysator.liu.se>.
* gmem.c: Fixed bug, that made compile fail for -DENABLE_MEM_PROFILE.
Wed Dec 16 23:04:26 CST 1998 Shawn T. Amundson <amundson@gtk.org> Wed Dec 16 23:04:26 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* Released GLib 1.1.9 * Released GLib 1.1.9

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
1998-12-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* garray.c (g_ptr_array_remove_index): Fixed size in g_memmove,
reported by Alexander Larsson <alla@lysator.liu.se>.
* gmem.c: Fixed bug, that made compile fail for -DENABLE_MEM_PROFILE.
Wed Dec 16 23:04:26 CST 1998 Shawn T. Amundson <amundson@gtk.org> Wed Dec 16 23:04:26 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* Released GLib 1.1.9 * Released GLib 1.1.9

7
ChangeLog.pre-2-12
View File

@ -1,3 +1,10 @@
1998-12-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* garray.c (g_ptr_array_remove_index): Fixed size in g_memmove,
reported by Alexander Larsson <alla@lysator.liu.se>.
* gmem.c: Fixed bug, that made compile fail for -DENABLE_MEM_PROFILE.
Wed Dec 16 23:04:26 CST 1998 Shawn T. Amundson <amundson@gtk.org> Wed Dec 16 23:04:26 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* Released GLib 1.1.9 * Released GLib 1.1.9

7
ChangeLog.pre-2-2
View File

@ -1,3 +1,10 @@
1998-12-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* garray.c (g_ptr_array_remove_index): Fixed size in g_memmove,
reported by Alexander Larsson <alla@lysator.liu.se>.
* gmem.c: Fixed bug, that made compile fail for -DENABLE_MEM_PROFILE.
Wed Dec 16 23:04:26 CST 1998 Shawn T. Amundson <amundson@gtk.org> Wed Dec 16 23:04:26 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* Released GLib 1.1.9 * Released GLib 1.1.9

7
ChangeLog.pre-2-4
View File

@ -1,3 +1,10 @@
1998-12-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* garray.c (g_ptr_array_remove_index): Fixed size in g_memmove,
reported by Alexander Larsson <alla@lysator.liu.se>.
* gmem.c: Fixed bug, that made compile fail for -DENABLE_MEM_PROFILE.
Wed Dec 16 23:04:26 CST 1998 Shawn T. Amundson <amundson@gtk.org> Wed Dec 16 23:04:26 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* Released GLib 1.1.9 * Released GLib 1.1.9

7
ChangeLog.pre-2-6
View File

@ -1,3 +1,10 @@
1998-12-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* garray.c (g_ptr_array_remove_index): Fixed size in g_memmove,
reported by Alexander Larsson <alla@lysator.liu.se>.
* gmem.c: Fixed bug, that made compile fail for -DENABLE_MEM_PROFILE.
Wed Dec 16 23:04:26 CST 1998 Shawn T. Amundson <amundson@gtk.org> Wed Dec 16 23:04:26 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* Released GLib 1.1.9 * Released GLib 1.1.9

7
ChangeLog.pre-2-8
View File

@ -1,3 +1,10 @@
1998-12-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* garray.c (g_ptr_array_remove_index): Fixed size in g_memmove,
reported by Alexander Larsson <alla@lysator.liu.se>.
* gmem.c: Fixed bug, that made compile fail for -DENABLE_MEM_PROFILE.
Wed Dec 16 23:04:26 CST 1998 Shawn T. Amundson <amundson@gtk.org> Wed Dec 16 23:04:26 CST 1998 Shawn T. Amundson <amundson@gtk.org>
* Released GLib 1.1.9 * Released GLib 1.1.9

2
garray.c
View File

@ -338,7 +338,7 @@ g_ptr_array_remove_index (GPtrArray* farray,
if (index != array->len - 1) if (index != array->len - 1)
g_memmove (array->pdata + index, array->pdata + index + 1, g_memmove (array->pdata + index, array->pdata + index + 1,
array->len - index - 1); sizeof (gpointer) * (array->len - index - 1));
array->pdata[array->len - 1] = NULL; array->pdata[array->len - 1] = NULL;

2
glib/garray.c
View File

@ -338,7 +338,7 @@ g_ptr_array_remove_index (GPtrArray* farray,
if (index != array->len - 1) if (index != array->len - 1)
g_memmove (array->pdata + index, array->pdata + index + 1, g_memmove (array->pdata + index, array->pdata + index + 1,
array->len - index - 1); sizeof (gpointer) * (array->len - index - 1));
array->pdata[array->len - 1] = NULL; array->pdata[array->len - 1] = NULL;

12
glib/gmem.c
View File

@ -304,9 +304,9 @@ g_realloc (gpointer mem,
#if defined(ENABLE_MEM_PROFILE) || defined(ENABLE_MEM_CHECK) #if defined(ENABLE_MEM_PROFILE) || defined(ENABLE_MEM_CHECK)
t = (gulong*) ((guchar*) mem - SIZEOF_LONG); t = (gulong*) ((guchar*) mem - SIZEOF_LONG);
#ifdef ENABLE_MEM_PROFILE #ifdef ENABLE_MEM_PROFILE
g_mutex_lock (mem_profile); g_mutex_lock (mem_profile_lock);
freed_mem += *t; freed_mem += *t;
g_mutex_unlock (mem_profile); g_mutex_unlock (mem_profile_lock);
#endif /* ENABLE_MEM_PROFILE */ #endif /* ENABLE_MEM_PROFILE */
mem = t; mem = t;
#endif /* ENABLE_MEM_PROFILE || ENABLE_MEM_CHECK */ #endif /* ENABLE_MEM_PROFILE || ENABLE_MEM_CHECK */
@ -375,9 +375,9 @@ g_free (gpointer mem)
t = (gulong*) ((guchar*) mem - SIZEOF_LONG); t = (gulong*) ((guchar*) mem - SIZEOF_LONG);
size = *t; size = *t;
#ifdef ENABLE_MEM_PROFILE #ifdef ENABLE_MEM_PROFILE
g_mutex_lock (mem_profile); g_mutex_lock (mem_profile_lock);
freed_mem += size; freed_mem += size;
g_mutex_unlock (mem_profile); g_mutex_unlock (mem_profile_lock);
#endif /* ENABLE_MEM_PROFILE */ #endif /* ENABLE_MEM_PROFILE */
mem = t; mem = t;
#endif /* ENABLE_MEM_PROFILE || ENABLE_MEM_CHECK */ #endif /* ENABLE_MEM_PROFILE || ENABLE_MEM_CHECK */
@ -408,12 +408,12 @@ g_mem_profile (void)
gulong local_allocated_mem; gulong local_allocated_mem;
gulong local_freed_mem; gulong local_freed_mem;
g_mutex_lock (mem_profile); g_mutex_lock (mem_profile_lock);
for (i = 0; i < (MEM_PROFILE_TABLE_SIZE - 1); i++) for (i = 0; i < (MEM_PROFILE_TABLE_SIZE - 1); i++)
local_allocations[i] = allocations[i]; local_allocations[i] = allocations[i];
local_allocated_mem = allocated_mem; local_allocated_mem = allocated_mem;
local_freed_mem = freed_mem; local_freed_mem = freed_mem;
g_mutex_unlock (mem_profile); g_mutex_unlock (mem_profile_lock);
for (i = 0; i < (MEM_PROFILE_TABLE_SIZE - 1); i++) for (i = 0; i < (MEM_PROFILE_TABLE_SIZE - 1); i++)
if (local_allocations[i] > 0) if (local_allocations[i] > 0)

12
gmem.c
View File

@ -304,9 +304,9 @@ g_realloc (gpointer mem,
#if defined(ENABLE_MEM_PROFILE) || defined(ENABLE_MEM_CHECK) #if defined(ENABLE_MEM_PROFILE) || defined(ENABLE_MEM_CHECK)
t = (gulong*) ((guchar*) mem - SIZEOF_LONG); t = (gulong*) ((guchar*) mem - SIZEOF_LONG);
#ifdef ENABLE_MEM_PROFILE #ifdef ENABLE_MEM_PROFILE
g_mutex_lock (mem_profile); g_mutex_lock (mem_profile_lock);
freed_mem += *t; freed_mem += *t;
g_mutex_unlock (mem_profile); g_mutex_unlock (mem_profile_lock);
#endif /* ENABLE_MEM_PROFILE */ #endif /* ENABLE_MEM_PROFILE */
mem = t; mem = t;
#endif /* ENABLE_MEM_PROFILE || ENABLE_MEM_CHECK */ #endif /* ENABLE_MEM_PROFILE || ENABLE_MEM_CHECK */
@ -375,9 +375,9 @@ g_free (gpointer mem)
t = (gulong*) ((guchar*) mem - SIZEOF_LONG); t = (gulong*) ((guchar*) mem - SIZEOF_LONG);
size = *t; size = *t;
#ifdef ENABLE_MEM_PROFILE #ifdef ENABLE_MEM_PROFILE
g_mutex_lock (mem_profile); g_mutex_lock (mem_profile_lock);
freed_mem += size; freed_mem += size;
g_mutex_unlock (mem_profile); g_mutex_unlock (mem_profile_lock);
#endif /* ENABLE_MEM_PROFILE */ #endif /* ENABLE_MEM_PROFILE */
mem = t; mem = t;
#endif /* ENABLE_MEM_PROFILE || ENABLE_MEM_CHECK */ #endif /* ENABLE_MEM_PROFILE || ENABLE_MEM_CHECK */
@ -408,12 +408,12 @@ g_mem_profile (void)
gulong local_allocated_mem; gulong local_allocated_mem;
gulong local_freed_mem; gulong local_freed_mem;
g_mutex_lock (mem_profile); g_mutex_lock (mem_profile_lock);
for (i = 0; i < (MEM_PROFILE_TABLE_SIZE - 1); i++) for (i = 0; i < (MEM_PROFILE_TABLE_SIZE - 1); i++)
local_allocations[i] = allocations[i]; local_allocations[i] = allocations[i];
local_allocated_mem = allocated_mem; local_allocated_mem = allocated_mem;
local_freed_mem = freed_mem; local_freed_mem = freed_mem;
g_mutex_unlock (mem_profile); g_mutex_unlock (mem_profile_lock);
for (i = 0; i < (MEM_PROFILE_TABLE_SIZE - 1); i++) for (i = 0; i < (MEM_PROFILE_TABLE_SIZE - 1); i++)
if (local_allocations[i] > 0) if (local_allocations[i] > 0)