From 31e7c4b6fbd91ebe7eeea0e9bcff9cb09a6492a3 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 8 Feb 2002 17:34:15 +0000 Subject: [PATCH] Fix access to freed memory in test case (Miroslaw Dobrzanski-Neumann). Fri Feb 8 12:32:14 2002 Owen Taylor * tests/hash-test.c (second_hash_test): Fix access to freed memory in test case (Miroslaw Dobrzanski-Neumann). Re-enable and debug some commented out code. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ tests/hash-test.c | 10 ++++------ 9 files changed, 52 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 78a042d93..1f3109e06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Feb 8 12:32:14 2002 Owen Taylor + + * tests/hash-test.c (second_hash_test): Fix access to + freed memory in test case (Miroslaw Dobrzanski-Neumann). + Re-enable and debug some commented out code. + 2002-02-08 Michael Natterer * glib/gdir.c: g_dir_open: added g_return_val_if_fail() to prevent diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 78a042d93..1f3109e06 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Fri Feb 8 12:32:14 2002 Owen Taylor + + * tests/hash-test.c (second_hash_test): Fix access to + freed memory in test case (Miroslaw Dobrzanski-Neumann). + Re-enable and debug some commented out code. + 2002-02-08 Michael Natterer * glib/gdir.c: g_dir_open: added g_return_val_if_fail() to prevent diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 78a042d93..1f3109e06 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Fri Feb 8 12:32:14 2002 Owen Taylor + + * tests/hash-test.c (second_hash_test): Fix access to + freed memory in test case (Miroslaw Dobrzanski-Neumann). + Re-enable and debug some commented out code. + 2002-02-08 Michael Natterer * glib/gdir.c: g_dir_open: added g_return_val_if_fail() to prevent diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 78a042d93..1f3109e06 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +Fri Feb 8 12:32:14 2002 Owen Taylor + + * tests/hash-test.c (second_hash_test): Fix access to + freed memory in test case (Miroslaw Dobrzanski-Neumann). + Re-enable and debug some commented out code. + 2002-02-08 Michael Natterer * glib/gdir.c: g_dir_open: added g_return_val_if_fail() to prevent diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 78a042d93..1f3109e06 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Fri Feb 8 12:32:14 2002 Owen Taylor + + * tests/hash-test.c (second_hash_test): Fix access to + freed memory in test case (Miroslaw Dobrzanski-Neumann). + Re-enable and debug some commented out code. + 2002-02-08 Michael Natterer * glib/gdir.c: g_dir_open: added g_return_val_if_fail() to prevent diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 78a042d93..1f3109e06 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Fri Feb 8 12:32:14 2002 Owen Taylor + + * tests/hash-test.c (second_hash_test): Fix access to + freed memory in test case (Miroslaw Dobrzanski-Neumann). + Re-enable and debug some commented out code. + 2002-02-08 Michael Natterer * glib/gdir.c: g_dir_open: added g_return_val_if_fail() to prevent diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 78a042d93..1f3109e06 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Fri Feb 8 12:32:14 2002 Owen Taylor + + * tests/hash-test.c (second_hash_test): Fix access to + freed memory in test case (Miroslaw Dobrzanski-Neumann). + Re-enable and debug some commented out code. + 2002-02-08 Michael Natterer * glib/gdir.c: g_dir_open: added g_return_val_if_fail() to prevent diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 78a042d93..1f3109e06 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Fri Feb 8 12:32:14 2002 Owen Taylor + + * tests/hash-test.c (second_hash_test): Fix access to + freed memory in test case (Miroslaw Dobrzanski-Neumann). + Re-enable and debug some commented out code. + 2002-02-08 Michael Natterer * glib/gdir.c: g_dir_open: added g_return_val_if_fail() to prevent diff --git a/tests/hash-test.c b/tests/hash-test.c index e199b954d..95d144fab 100644 --- a/tests/hash-test.c +++ b/tests/hash-test.c @@ -189,7 +189,6 @@ static void not_even_foreach (gpointer key, g_assert (*_value != 0); i = atoi (_key); - g_assert (atoi (_key) > 0); sprintf (val, "%d value", i); g_assert (strcmp (_value, val) == 0); @@ -214,7 +213,6 @@ static gboolean remove_even_foreach (gpointer key, g_assert (*_value != 0); i = atoi (_key); - g_assert (i > 0); sprintf (val, "%d value", i); g_assert (strcmp (_value, val) == 0); @@ -262,17 +260,15 @@ static void second_hash_test (gboolean simple_hash) g_assert (atoi (v) == i); } - /**** future test stuff, yet to be debugged sprintf (key, "%d", 3); g_hash_table_remove (h, key); g_hash_table_foreach_remove (h, remove_even_foreach, NULL); g_hash_table_foreach (h, not_even_foreach, NULL); - */ for (i=0; i<20; i++) { - if (((i % 2) == 0) || (i == 3)) - i++; + if ((i % 2) == 0 || i == 3) + continue; sprintf (key, "%d", i); g_assert (atoi(key) == i); @@ -286,6 +282,8 @@ static void second_hash_test (gboolean simple_hash) (gpointer)&orig_val); g_assert (found); + g_hash_table_remove (h, key); + g_assert (orig_key != NULL); g_assert (strcmp (key, orig_key) == 0); g_free (orig_key);