From cdb61955724cd0f97546a86421b52b4da66e8ae5 Mon Sep 17 00:00:00 2001 From: Sebastian Wilhelmi Date: Tue, 21 Mar 2000 13:46:59 +0000 Subject: [PATCH] Allocate only up to 128KB for a pathname. While this is an arbitrary value 2000-03-21 Sebastian Wilhelmi * gutils.c (g_get_current_dir): Allocate only up to 128KB for a pathname. While this is an arbitrary value just like 2048, it seems to be enough (after all, even 4GB is an arbitrary value). --- 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 ++++++ glib/gutils.c | 2 +- gutils.c | 2 +- 10 files changed, 50 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9d969011..83d15ab0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-03-21 Sebastian Wilhelmi + + * gutils.c (g_get_current_dir): Allocate only up to 128KB for a + pathname. While this is an arbitrary value just like 2048, it + seems to be enough (after all, even 4GB is an arbitrary value). + 2000-03-20 Sebastian Wilhelmi * gmain.c (g_main_poll): Warn in case of an error during the call diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index f9d969011..83d15ab0c 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2000-03-21 Sebastian Wilhelmi + + * gutils.c (g_get_current_dir): Allocate only up to 128KB for a + pathname. While this is an arbitrary value just like 2048, it + seems to be enough (after all, even 4GB is an arbitrary value). + 2000-03-20 Sebastian Wilhelmi * gmain.c (g_main_poll): Warn in case of an error during the call diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f9d969011..83d15ab0c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2000-03-21 Sebastian Wilhelmi + + * gutils.c (g_get_current_dir): Allocate only up to 128KB for a + pathname. While this is an arbitrary value just like 2048, it + seems to be enough (after all, even 4GB is an arbitrary value). + 2000-03-20 Sebastian Wilhelmi * gmain.c (g_main_poll): Warn in case of an error during the call diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index f9d969011..83d15ab0c 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2000-03-21 Sebastian Wilhelmi + + * gutils.c (g_get_current_dir): Allocate only up to 128KB for a + pathname. While this is an arbitrary value just like 2048, it + seems to be enough (after all, even 4GB is an arbitrary value). + 2000-03-20 Sebastian Wilhelmi * gmain.c (g_main_poll): Warn in case of an error during the call diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f9d969011..83d15ab0c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2000-03-21 Sebastian Wilhelmi + + * gutils.c (g_get_current_dir): Allocate only up to 128KB for a + pathname. While this is an arbitrary value just like 2048, it + seems to be enough (after all, even 4GB is an arbitrary value). + 2000-03-20 Sebastian Wilhelmi * gmain.c (g_main_poll): Warn in case of an error during the call diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f9d969011..83d15ab0c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2000-03-21 Sebastian Wilhelmi + + * gutils.c (g_get_current_dir): Allocate only up to 128KB for a + pathname. While this is an arbitrary value just like 2048, it + seems to be enough (after all, even 4GB is an arbitrary value). + 2000-03-20 Sebastian Wilhelmi * gmain.c (g_main_poll): Warn in case of an error during the call diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f9d969011..83d15ab0c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2000-03-21 Sebastian Wilhelmi + + * gutils.c (g_get_current_dir): Allocate only up to 128KB for a + pathname. While this is an arbitrary value just like 2048, it + seems to be enough (after all, even 4GB is an arbitrary value). + 2000-03-20 Sebastian Wilhelmi * gmain.c (g_main_poll): Warn in case of an error during the call diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f9d969011..83d15ab0c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2000-03-21 Sebastian Wilhelmi + + * gutils.c (g_get_current_dir): Allocate only up to 128KB for a + pathname. While this is an arbitrary value just like 2048, it + seems to be enough (after all, even 4GB is an arbitrary value). + 2000-03-20 Sebastian Wilhelmi * gmain.c (g_main_poll): Warn in case of an error during the call diff --git a/glib/gutils.c b/glib/gutils.c index b858a7db8..a6784fea2 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -346,7 +346,7 @@ g_get_current_dir (void) *buffer = 0; dir = getwd (buffer); #else /* !sun */ - while (1) + while (max_len < 128 * 1024) { buffer = g_new (gchar, max_len + 1); *buffer = 0; diff --git a/gutils.c b/gutils.c index b858a7db8..a6784fea2 100644 --- a/gutils.c +++ b/gutils.c @@ -346,7 +346,7 @@ g_get_current_dir (void) *buffer = 0; dir = getwd (buffer); #else /* !sun */ - while (1) + while (max_len < 128 * 1024) { buffer = g_new (gchar, max_len + 1); *buffer = 0;