[ruby-core:26677] Re: [Bug #2353] hash.c:setenv causes crashes in Solaris

Hi,

At Wed, 11 Nov 2009 11:32:37 +0900,
Christian H=F6ltje wrote in [ruby-core:26675]:
> Because new variables are allocated by ALLOC_N() but the
> unsetenv code cannot de-allocate the memory: we don't know if
> it is initially allocated memory by the kernel (which I think
> is stack memory and absolutely cannot be free()d) or if it is
> something we did a putenv() on (which we cannot free()
> either, depending on the platform).

Does this work?

=0C
Index: hash.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- hash.c	(revision 25717)
+++ hash.c	(working copy)
@@ -2012,5 +2012,16 @@ rb_env_path_tainted(void)
 }
=20
-#if !defined(_WIN32) && !(defined(HAVE_SETENV) && defined(HAVE_UNSETENV))
+#if defined(_WIN32) || (defined(HAVE_SETENV) && defined(HAVE_UNSETENV))
+#elif defined __sun__
+static int
+in_origenv(const char *str)
+{
+    char **env;
+    for (env =3D origenviron; *env; ++env) {
+	if (*env =3D=3D str) return 1;
+    }
+    return 0;
+}
+#else
 static int
 envix(const char *nam)
@@ -2058,4 +2069,19 @@ ruby_setenv(const char *name, const char
     else
 	unsetenv(name);
+#elif defined __sun__
+    size_t len =3D strlen(name);
+    char **env_ptr, *str;
+    for (env_ptr =3D GET_ENVIRON(environ); (str =3D *env_ptr) !=3D 0; ++en=
v_ptr) {
+	if (!strncmp(str, name, len) && str[len] =3D=3D '=3D') {
+	    if (!in_origenv(str)) free(str);
+	    while ((env_ptr[0] =3D env_ptr[1]) !=3D 0) env_ptr++;
+	    break;
+	}
+    }
+    if (value) {
+	str =3D malloc(len +=3D strlen(value) + 2);
+	snprintf(str, len, "%s=3D%s", name, value);
+	putenv(str);
+    }
 #else  /* WIN32 */
     size_t len;
=0C

--=20
Nobu Nakada