Changeset 1250 for cacamoo/trunkTweet

Timestamp:

Oct 27, 2006, 10:42:52 PM (16 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Fixed double free in wonderfull perl interpreter

File:

• cacamoo/trunk/src/main.c (modified) (14 diffs)

cacamoo/trunk/src/main.c

@@ -252 +252 @@
 
     /* Import our buffer as an ansi (color) one */
-    input_buffer = cucul_load_memory(buffer, buffer_size);
+    input_buffer = cucul_load_memory(buffer, buffer_size-1);
     if(input_buffer == NULL)
     {
@@ -265 +265 @@
     }
     /* Export given canvas to format we want */
-    output_buffer = cucul_export_canvas(canvas, "irc");
+    output_buffer = cucul_export_canvas(canvas, "ansi");
     if(output_buffer == NULL)
     {
@@ -369 +369 @@
     /* AHAHAH, THAT'S A COOL PERL INTERPRETER ! */
     temp2 = replace(temp, " = <<\"EOC\";", "");
-    if(temp2 != temp)
+    if(temp!=temp2 && temp2 !=NULL)
     {
         free(temp);
@@ -375 +375 @@
     }
     temp2 = replace(temp, " = <<EOC;"    , "");
-    if(temp2 != temp)
+    if(temp!=temp2 && temp2 !=NULL)
     {
         free(temp);
@@ -381 +381 @@
     }
     temp2 = replace(temp, " = <<EOC"     , "");
-    if(temp2 != temp)
+    if(temp!=temp2 && temp2 !=NULL)
     {
         free(temp);
@@ -387 +387 @@
     }
     temp2 = replace(temp, " = << EOC"    , "");
-    if(temp2 != temp)
+    if(temp!=temp2 && temp2 !=NULL)
     {
         free(temp);
@@ -393 +393 @@
     }
     temp2 = replace(temp, "EOC"          , "");
-    if(temp2 != temp)
+    if(temp!=temp2 && temp2 !=NULL)
     {
         free(temp);
@@ -399 +399 @@
     }
     temp2 = replace(temp, "$eyes"        , cacamoo_use_eyes);
-    if(temp2 != temp)
+    if(temp!=temp2 && temp2 !=NULL)
     {
         free(temp);
@@ -405 +405 @@
     }
     temp2 = replace(temp, "${eyes}"      , cacamoo_use_eyes);
-    if(temp2 != temp)
-    {
-        free(temp);
-        temp = temp2;
-    }
-
+    if(temp!=temp2 && temp2 !=NULL)
+    {
+        free(temp);
+        temp = temp2;
+    }
     temp2 = replace(temp, "$tongue"      , cacamoo_use_tongue);
-    if(temp2 != temp)
+    if(temp!=temp2 && temp2 !=NULL)
     {
         free(temp);
@@ -418 +417 @@
     }
     temp2 = replace(temp, "${tongue}"    , cacamoo_use_tongue);
-    if(temp2 != temp)
-    {
-        free(temp);
-        temp = temp2;
-    }
-
+    if(temp!=temp2 && temp2 !=NULL)
+    {
+        free(temp);
+        temp = temp2;
+    }
     temp2 = replace(temp, "$thoughts"    , cacamoo_thoughts);
-    if(temp2 != temp)
+    if(temp!=temp2 && temp2 !=NULL)
     {
         free(temp);
@@ -431 +429 @@
     }
     temp2 = replace(temp, "${thoughts}"  , cacamoo_thoughts);
-    if(temp2 != temp)
-    {
-        free(temp);
-        temp = temp2;
-    }
-
+    if(temp!=temp2 && temp2 !=NULL)
+    {
+        free(temp);
+        temp = temp2;
+    }
     temp2 = replace(temp, "$the_cow"     , (const char*)string);
-    if(temp2 != temp)
+    if(temp!=temp2 && temp2 !=NULL)
     {
         free(temp);
@@ -444 +441 @@
     }
     temp2 = replace(temp, "${the_cow}"   , (const char*)string);
-    if(temp2 != temp)
-    {
-        free(temp);
-        temp = temp2;
-    }
-
+    if(temp!=temp2 && temp2 !=NULL)
+    {
+        free(temp);
+        temp = temp2;
+    }
     *size = strlen(temp)+1;
 
@@ -509 +505 @@
 }
 
-
 char *replace(char *str, char *oldpiece, const char *newpiece)
 {
@@ -554 +549 @@
         if((c = (char *) strstr(str+str_index, oldpiece)) != NULL)
             oldpiece_index = c - str;
-
-
     }
     /* Copy remaining characters from the right of last matched pattern */