From 147ca6cbc88c0753d936c5c75dbfed4748f98d6e Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 8 Feb 2002 17:08:22 +0000 Subject: [PATCH] g_dir_open: added g_return_val_if_fail() to prevent us from calling 2002-02-08 Michael Natterer * glib/gdir.c: g_dir_open: added g_return_val_if_fail() to prevent us from calling opendir(NULL) (which simply crashes). --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gdir.c | 6 +++++- 9 files changed, 45 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 24826b5..78a042d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-02-08 Michael Natterer + + * glib/gdir.c: g_dir_open: added g_return_val_if_fail() to prevent + us from calling opendir(NULL) (which simply crashes). + 2002-02-08 Sebastian Wilhelmi * glib/gfileutils.c (g_file_test): Extended documentation. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 24826b5..78a042d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2002-02-08 Michael Natterer + + * glib/gdir.c: g_dir_open: added g_return_val_if_fail() to prevent + us from calling opendir(NULL) (which simply crashes). + 2002-02-08 Sebastian Wilhelmi * glib/gfileutils.c (g_file_test): Extended documentation. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 24826b5..78a042d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2002-02-08 Michael Natterer + + * glib/gdir.c: g_dir_open: added g_return_val_if_fail() to prevent + us from calling opendir(NULL) (which simply crashes). + 2002-02-08 Sebastian Wilhelmi * glib/gfileutils.c (g_file_test): Extended documentation. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 24826b5..78a042d 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2002-02-08 Michael Natterer + + * glib/gdir.c: g_dir_open: added g_return_val_if_fail() to prevent + us from calling opendir(NULL) (which simply crashes). + 2002-02-08 Sebastian Wilhelmi * glib/gfileutils.c (g_file_test): Extended documentation. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 24826b5..78a042d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2002-02-08 Michael Natterer + + * glib/gdir.c: g_dir_open: added g_return_val_if_fail() to prevent + us from calling opendir(NULL) (which simply crashes). + 2002-02-08 Sebastian Wilhelmi * glib/gfileutils.c (g_file_test): Extended documentation. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 24826b5..78a042d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2002-02-08 Michael Natterer + + * glib/gdir.c: g_dir_open: added g_return_val_if_fail() to prevent + us from calling opendir(NULL) (which simply crashes). + 2002-02-08 Sebastian Wilhelmi * glib/gfileutils.c (g_file_test): Extended documentation. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 24826b5..78a042d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2002-02-08 Michael Natterer + + * glib/gdir.c: g_dir_open: added g_return_val_if_fail() to prevent + us from calling opendir(NULL) (which simply crashes). + 2002-02-08 Sebastian Wilhelmi * glib/gfileutils.c (g_file_test): Extended documentation. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 24826b5..78a042d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2002-02-08 Michael Natterer + + * glib/gdir.c: g_dir_open: added g_return_val_if_fail() to prevent + us from calling opendir(NULL) (which simply crashes). + 2002-02-08 Sebastian Wilhelmi * glib/gfileutils.c (g_file_test): Extended documentation. diff --git a/glib/gdir.c b/glib/gdir.c index ffea4f6..aaf967a 100644 --- a/glib/gdir.c +++ b/glib/gdir.c @@ -61,7 +61,11 @@ g_dir_open (const gchar *path, guint flags, GError **error) { - GDir *dir = g_new (GDir, 1); + GDir *dir; + + g_return_val_if_fail (path != NULL, NULL); + + dir = g_new (GDir, 1); dir->dir = opendir (path); -- 2.7.4