summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--missing/setproctitle.c6
2 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index def0815d18..865ff13120 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 14 19:50:46 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * missing/setproctitle.c (compat_init_setproctitle): use
+ ruby_strdup() instead of strdup().
+
Sat May 14 19:37:31 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* include/ruby/missing.h: add setproctitle() declaration.
diff --git a/missing/setproctitle.c b/missing/setproctitle.c
index 23b09d259b..8922d58ab6 100644
--- a/missing/setproctitle.c
+++ b/missing/setproctitle.c
@@ -110,12 +110,8 @@ compat_init_setproctitle(int argc, char *argv[])
argv_len = lastargv - argv[0];
argv_env_len = lastenvp - argv[0];
- /*
- * Copy environment
- * XXX - will truncate env on strdup fail
- */
for (i = 0; envp[i] != NULL; i++)
- environ[i] = strdup(envp[i]);
+ environ[i] = ruby_strdup(envp[i]);
environ[i] = NULL;
#endif /* SPT_REUSEARGV */
}