From: Bjorn Munch
Date: November 29 2010 3:49pm
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2956) Bug#58522
List-Archive: http://lists.mysql.com/commits/125377
X-Bug: 58522
Message-Id: <201011291549.oATFnKgC026639@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0412377679=="

--===============0412377679==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/bm136801/my/lvarset-51/ based on revid:bjorn.munch@stripped

 2956 Bjorn Munch	2010-11-29
      Bug #58522 mtr --debug leaks memory when test fails
      Backported use of setenv() from 5.5
      This will remove the leak on systems that have setenv()
      I have not fixed the string.c leak, it's a local variable
         that the cleanup function cannot access.

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-11-17 15:05:52 +0000
+++ b/client/mysqltest.cc	2010-11-29 15:44:57 +0000
@@ -73,6 +73,10 @@
 #define QUERY_SEND_FLAG  1
 #define QUERY_REAP_FLAG  2
 
+#ifndef HAVE_SETENV
+static int setenv(const char *name, const char *value, int overwrite);
+#endif
+
 enum {
   OPT_SKIP_SAFEMALLOC=OPT_MAX_CLIENT_OPTION,
   OPT_PS_PROTOCOL, OPT_SP_PROTOCOL, OPT_CURSOR_PROTOCOL, OPT_VIEW_PROTOCOL,
@@ -219,7 +223,6 @@ typedef struct
   int alloced_len;
   int int_dirty; /* do not update string if int is updated until first read */
   int alloced;
-  char *env_s;
 } VAR;
 
 /*Perl/shell-like variable registers */
@@ -1962,7 +1965,7 @@ VAR *var_init(VAR *v, const char *name,
     val_len = strlen(val) ;
   val_alloc_len = val_len + 16; /* room to grow */
   if (!(tmp_var=v) && !(tmp_var = (VAR*)my_malloc(sizeof(*tmp_var)
-                                                  + name_len+1, MYF(MY_WME))))
+                                                  + name_len+2, MYF(MY_WME))))
     die("Out of memory");
 
   tmp_var->name = (name) ? (char*) tmp_var + sizeof(*tmp_var) : 0;
@@ -1971,7 +1974,12 @@ VAR *var_init(VAR *v, const char *name,
   if (!(tmp_var->str_val = (char*)my_malloc(val_alloc_len+1, MYF(MY_WME))))
     die("Out of memory");
 
-  memcpy(tmp_var->name, name, name_len);
+  if (name)
+  {
+    memcpy(tmp_var->name, name, name_len);
+    tmp_var->name[name_len]= 0;
+  }
+  
   if (val)
   {
     memcpy(tmp_var->str_val, val, val_len);
@@ -1982,7 +1990,6 @@ VAR *var_init(VAR *v, const char *name,
   tmp_var->alloced_len = val_alloc_len;
   tmp_var->int_val = (val) ? atoi(val) : 0;
   tmp_var->int_dirty = 0;
-  tmp_var->env_s = 0;
   return tmp_var;
 }
 
@@ -2110,20 +2117,15 @@ void var_set(const char *var_name, const
 
   if (env_var)
   {
-    char buf[1024], *old_env_s= v->env_s;
     if (v->int_dirty)
     {
       sprintf(v->str_val, "%d", v->int_val);
       v->int_dirty= 0;
       v->str_val_len= strlen(v->str_val);
     }
-    my_snprintf(buf, sizeof(buf), "%.*s=%.*s",
-                v->name_len, v->name,
-                v->str_val_len, v->str_val);
-    if (!(v->env_s= my_strdup(buf, MYF(MY_WME))))
-      die("Out of memory");
-    putenv(v->env_s);
-    my_free(old_env_s, MYF(MY_ALLOW_ZERO_PTR));
+    /* setenv() expects \0-terminated strings */
+    DBUG_ASSERT(v->name[v->name_len] == 0);
+    setenv(v->name, v->str_val, 1);
   }
   DBUG_VOID_RETURN;
 }
@@ -9899,3 +9901,18 @@ void dynstr_append_sorted(DYNAMIC_STRING
   delete_dynamic(&lines);
   DBUG_VOID_RETURN;
 }
+
+#ifndef HAVE_SETENV
+static int setenv(const char *name, const char *value, int overwrite)
+{
+ size_t buflen= strlen(name) + strlen(value) + 2;
+ char *envvar= (char *)malloc(buflen);
+ if(!envvar)
+ return ENOMEM;
+ strcpy(envvar, name);
+ strcat(envvar, "=");
+ strcat(envvar, value);
+ putenv(envvar);
+ return 0;
+}
+#endif


--===============0412377679==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/lvarset-51/
# testament_sha1: 23a6e90809fa94a53356361f087bbaaef74b989e
# timestamp: 2010-11-29 16:49:20 +0100
# base_revision_id: bjorn.munch@stripped\
#   74opxo7davkjp4xh
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfKfvtsAAi9fgEAQeP///3fj
n66////6UAVXM029UONa07a7hbQJRIyBNMTSYZExNMKPQ0yamnohoaMJp5QDKAAjQ1PSAJAAAGgM
gNADR6hxkyaGIxNGARgJhAGAmmjTI0AwkUENJqanpgnpT1HiDRqBk0AAaAAGgkkJoEwlPZEn6NU2
FMyEaANA0AADQ9RHtsjPgGs3P6HfQadPHZr4xDffTFZCGJAfdveEtd+U1Wje1wqaNWslGqb2QnKX
lKYc6RNoYm22zZ1cuK/8Y2i0dNXVlYDdPu381+Z3YchCPcKssW9Dg9T4HZurP0sTSqJXvPxnvE7L
xaGVMDI0qeeX1/r+bubhi9YzCLIzH6TVOMa1wlEpkdL7KMHbLkA0H58sl0iJqYoYSYluwQGzKlm8
NXYyMFJBTUDCHSeaTVFkkKGhS+hW+2vq1UUBY58qYR0K31r1zAdKwQVX4Q5X2IruQ0CFwzI24qpi
7eoSzAwlwGjBcyTwPac8aUohYRC9tiekbz9GFwIq+q2iyPnTegRJCICIut75v1GfnUwtNM44KTFJ
myAl6LtWsn42kjCaFsmVLMglAioFzk1R4Tzh1pJ0UB6+V6BFq9r3iYpoy53GItC4VVFfTNuBVBhG
DzsLyFqWnDsHn+aB2gogZoAlMasRVyseltA+F67b0jJE8BrbhfpOYgYleawGbG6wVv+KxRz3ReyG
yFcxA43ujkWKDST8FhzdWpeTtkmWHIh4xcDkwDPSF1YKIBd7sC3bWg7wNa4SSmF60gbL6CKltZcl
2OJoMbxkIhKBMGIk0JvXqYuxfiLTGtawqlDPmL7B2DJ3bVpws+Tp2eA+pTg1LCEEsic7To8ZoO1F
wnjqudILCSHXLXVDFPUEpKGq+QA6BdaNfYh5K9LuMXw36s/VkeroeYRu27com1EP55kU6iqvkvby
m665bO89k8DjwaSSceD/gr6cFjtH74vkeqAaOnKCPCcYyh7E5A8anh7L3EbQ6DXq68242knx795Y
lvzIiXK4KHqvqo5nBckrpoy3C6pQKkMTwIjp2nIFpLPXIbohS72G7UGs6xWcKWab9jOIXj5Td7Cz
vmKDmskrQu3B4k6HG7aQaYxIcpABT6IEirQsT3Qw+IQB6rrnNlrlojRyKxM99KqVaW1Mp/oaqBPp
lVc1pWLczYGKrFHDKIKTipn3EH275o76Wc8ooBwR10SBwN1ObGrrbiEs4sEWmVX3jNXYhnW3wYWz
LNLbA+pytMCKjkTjoD0tVtx+TKYySudoLAiSkwofj3uR0J6LbMzz1ZWYHY+ckwDrDn2TOUkcMTut
uRHQKBuRG8SvBizFY1tKP6e7n6LEpS/UOGq5upNxybiwY3mIs+Cy55ibXELbCAZ67rYb4RaecFij
H6SaAp2P9mxEKE6cgmPkFv3RJqgpVgo92aW1xiFMoQeFcJkhi5OyGTMzMOH0R0O20wZ1CpgGztgH
6yNGEn5RdEN8G6MBDgHhUOUkbxyzmYlYnBIcGx8RZ0HTBtjH12ZuwwUA0FpbFb1W62YTCoTam0oJ
i6Czvq8xUekFZFhwRCRxrrSLwtXSC8RHSzGY+OWE5jO1HkWQWBRKtTagSqo7qeauypYy2zLS5Xix
MC9OFEltgsEkMu5IEa9tRUKSIiJViEgFdnXQY5CAgDZ6X8ctNb2IhfltyI7KuRHaoBpMRUrn5PQ2
1eYsNgMjUQqDkyJOavDC29Dn0g5shgc1GHERUyEs0qkZ3kzXaUxtFlzKYTh5tG8FqwcA6SVyy2Hb
rDYd9tBs9lSQ6iq8u28hIlmOEnKLKcWqMnMdKIDPu0ktKYnB6eLnImgTunAcbtZqJKHcqvV4oBOb
4Dio1GlYeU6DYPurXiqsJbS/gzf8XckU4UJDyn77bA==


--===============0412377679==--