Merge lp:~brianaker/drizzle/ip-memory-leak into lp:~drizzle-trunk/drizzle/development

[Brian Aker]

=== modified file 'drizzled/type/ipv6.h'
--- drizzled/type/ipv6.h	2011-08-21 23:08:13 +0000
+++ drizzled/type/ipv6.h	2011-09-21 15:52:27 +0000
@@ -185,7 +185,9 @@
     int ipv6_inet_pton(const char *src)
     {
         if (strlen(src)> IPV6_DISPLAY_LENGTH)
-            return 0;   //Invalid IPaddress
+        {
+          return 0;   //Invalid IPaddress
+        }
 
         //Local variables
         char ipv6[IPV6_BUFFER_LENGTH];
@@ -298,14 +300,14 @@
             return 0;
         }
 
-        int num_miss_octet =0, size =0;
+        int num_miss_octet =0;
 
 	num_miss_octet = 8 - octet_count;
+#if 0
         size = 2*num_miss_octet +1;
-
-	char * zero_append = new char[size];
-
-        memset(zero_append, 0, sizeof(zero_append));
+#endif
+
+        std::string zero_append;
 
         ptr_src = ipv6_temp;
 
@@ -343,22 +345,24 @@
         if(colon>0)
         {
             //zero padding format according to the '::' position
-            strcpy(zero_append,"");
+            zero_append+= "";
 
             for (int i= 0; i < num_miss_octet; i++)
             {
                 if(colon==1) // start
                 {
-                    strcat(zero_append,"0:");
+                    zero_append+= "0:";
                 }
+
                 if(colon==2 || colon==3)  //middle or end colon =2 shows at end
                 {
-                    strcat(zero_append,":0");
+                    zero_append+= ":0";
                 }
             }
+
             if(colon==3)
             {
-                strcat(zero_append,":");
+                zero_append+= ":";
             }
 
             ptr_src = temp_end;
@@ -390,11 +394,11 @@
 
             if(colon==2) // end
             {
-                strcat(temp_first,zero_append);
+                strcat(temp_first, zero_append.c_str());
             }
             else
             {
-                strcat(temp_first,zero_append);
+                strcat(temp_first, zero_append.c_str());
 
                 strcat(temp_first,temp_end);
             }
@@ -461,8 +465,6 @@
                 ptr_src = strtok (NULL, ":");
         }// end of main while loop
 
-        delete [] zero_append;
-
         return 1;
     }// end of Ipv6_Inet_pton function