4 files changed, 104 insertions, 27 deletions

diff --git a/noncore/todayplugins/stockticker/libstocks/csv.c b/noncore/todayplugins/stockticker/libstocks/csv.c
index 86d8607..110df7c 100644
--- a/noncore/todayplugins/stockticker/libstocks/csv.c
+++ b/noncore/todayplugins/stockticker/libstocks/csv.c
@@ -142,5 +142,9 @@ stock *parse_csv_file(char *csv)
     
     ptr = csv_strtok(line, ",");
-    if (!ptr) return 0;
+    if (!ptr)
+      {
+        free_stock(StockPtr);
+        return 0;
+      }
 
     symbol = (char *)malloc(strlen(ptr)+1);
@@ -155,5 +159,9 @@ stock *parse_csv_file(char *csv)
 
     ptr = csv_strtok(NULL, ",");
-    if (!ptr) return 0;
+    if (!ptr)
+      {
+        free_stock(StockPtr);
+        return 0;
+      }
 
     name = (char *)malloc(strlen(ptr)+1);
@@ -168,9 +176,17 @@ stock *parse_csv_file(char *csv)
 
     ptr = csv_strtok(NULL, ",");
-    if (!ptr) return 0;
+    if (!ptr)
+      {
+        free_stock(StockPtr);
+        return 0;
+      }
     sscanf(ptr,"%f",&(StockPtr->CurrentPrice));
 
     ptr = csv_strtok(NULL, ",");
-    if (!ptr) return 0;
+    if (!ptr)
+      {
+        free_stock(StockPtr);
+        return 0;
+      }
 
     date = (char *)malloc(strlen(ptr)+1);
@@ -185,5 +201,9 @@ stock *parse_csv_file(char *csv)
 
     ptr = csv_strtok(NULL, ",");
-    if (!ptr) return 0;
+    if (!ptr)
+      {
+        free_stock(StockPtr);
+        return 0;
+      }
 
     time = (char *)malloc(strlen(ptr)+1);
@@ -198,5 +218,9 @@ stock *parse_csv_file(char *csv)
     
     ptr = csv_strtok(NULL, ",");
-    if (!ptr) return 0;
+    if (!ptr)
+      {
+        free_stock(StockPtr);
+        return 0;
+      }
     sscanf(ptr,"%f",&(StockPtr->Variation));      
     
@@ -207,17 +231,33 @@ stock *parse_csv_file(char *csv)
 
     ptr = csv_strtok(NULL, ",");
-    if (!ptr) return 0;
+    if (!ptr)
+      {
+        free_stock(StockPtr);
+        return 0;
+      }
     sscanf(ptr,"%f",&(StockPtr->OpenPrice));      
 
     ptr = csv_strtok(NULL, ",");
-    if (!ptr) return 0;
+    if (!ptr)
+      {
+        free_stock(StockPtr);
+        return 0;
+      }
     sscanf(ptr,"%f",&(StockPtr->MaxPrice));      
 
     ptr = csv_strtok(NULL, ",");
-    if (!ptr) return 0;
+    if (!ptr)
+      {
+        free_stock(StockPtr);
+        return 0;
+      }
     sscanf(ptr,"%f",&(StockPtr->MinPrice));      
   
     ptr = csv_strtok(NULL, ",");
-    if (!ptr) return 0;
+    if (!ptr)
+      {
+        free_stock(StockPtr);
+        return 0;
+      }
     StockPtr->Volume = atoi(ptr);
 
@@ -248,5 +288,9 @@ stock *parse_csv_file(char *csv)
     
     ptr = csv_strtok(line, ",");
-    if (!ptr) return 0;
+    if (!ptr)
+      {
+        free_stock(StockPtr);
+        return 0;
+      }
 
     symbol = (char *)malloc(strlen(ptr)+1);
@@ -329,5 +373,11 @@ stock *parse_csv_history_file(char *csv_file)
       /* Date */
       ptr = strtok(line, ",");
-      if (!ptr) return 0;
+      if (!ptr)
+        {
+          free_stock(StockPtr);
+          free_stock(FirstStockPtr);
+          free_stock(LastStockPtr);
+          return 0;
+        }
 
       sscanf(ptr,"%d-%3s-%d",&day,smonth,&year);
@@ -355,20 +405,44 @@ stock *parse_csv_history_file(char *csv_file)
       /* Open */
       ptr = strtok(NULL, ",");
-      if (!ptr) return 0;
+      if (!ptr)
+        {
+          free_stock(StockPtr);
+          free_stock(FirstStockPtr);
+          free_stock(LastStockPtr);
+          return 0;
+        }
       sscanf(ptr,"%f",&(StockPtr->OpenPrice));      
 
       /* High */
       ptr = strtok(NULL, ",");
-      if (!ptr) return 0;
+      if (!ptr)
+        {
+          free_stock(StockPtr);
+          free_stock(FirstStockPtr);
+          free_stock(LastStockPtr);
+          return 0;
+        }
       sscanf(ptr,"%f",&(StockPtr->MaxPrice));
 
       /* Low */
       ptr = strtok(NULL, ",");
-      if (!ptr) return 0;
+      if (!ptr)
+        {
+          free_stock(StockPtr);
+          free_stock(FirstStockPtr);
+          free_stock(LastStockPtr);
+          return 0;
+        }
       sscanf(ptr,"%f",&(StockPtr->MinPrice));
 
       /* Close */
       ptr = strtok(NULL, ",");
-      if (!ptr) return 0;
+      if (!ptr)
+        {
+          free_stock(StockPtr);
+          free_stock(FirstStockPtr);
+          free_stock(LastStockPtr);
+          return 0;
+        }
       sscanf(ptr,"%f",&(StockPtr->LastPrice));
 
diff --git a/noncore/todayplugins/stockticker/libstocks/currency.c b/noncore/todayplugins/stockticker/libstocks/currency.c
index 9a08a9d..e0090e2 100644
--- a/noncore/todayplugins/stockticker/libstocks/currency.c
+++ b/noncore/todayplugins/stockticker/libstocks/currency.c
@@ -53,4 +53,5 @@ libstocks_return_code get_currency_exchange(char *from,
   
   error = get_stocks(symbol, &data);
+  free(symbol);
   if (error) 
     {
diff --git a/noncore/todayplugins/stockticker/libstocks/lists.h b/noncore/todayplugins/stockticker/libstocks/lists.h
index 0132317..a0eb434 100644
--- a/noncore/todayplugins/stockticker/libstocks/lists.h
+++ b/noncore/todayplugins/stockticker/libstocks/lists.h
@@ -31,4 +31,5 @@
 
 PUBEXT_LISTS  stock *malloc_stock(void); 
+PUBEXT_LISTS  void   free_stock(stock*);
 
 
diff --git a/noncore/todayplugins/stockticker/libstocks/stocks.c b/noncore/todayplugins/stockticker/libstocks/stocks.c
index eb04ba9..3a26a47 100644
--- a/noncore/todayplugins/stockticker/libstocks/stocks.c
+++ b/noncore/todayplugins/stockticker/libstocks/stocks.c
@@ -238,5 +238,4 @@ libstocks_return_code get_stocks(const char *stocks, stock **stock_datas)
   {
   case YAHOO_US:
-
     if (us_quotes) 
       {
@@ -247,6 +246,6 @@ libstocks_return_code get_stocks(const char *stocks, stock **stock_datas)
         if(us_quotes_temp==NULL)
     {
-      fprintf(stderr,"Memory allocating error (%s line %d)\n"
-        ,__FILE__, __LINE__);
+                    fprintf(stderr,"Memory allocating error (%s line %d)\n",
+                            __FILE__, __LINE__);
       exit(1);  
     }
@@ -264,6 +263,6 @@ libstocks_return_code get_stocks(const char *stocks, stock **stock_datas)
         if(us_quotes==NULL)
     {
-      fprintf(stderr,"Memory allocating error (%s line %d)\n"
-        ,__FILE__, __LINE__);
+                     fprintf(stderr,"Memory allocating error (%s line %d)\n",
+                             __FILE__, __LINE__);
       exit(1);  
     }
@@ -274,5 +273,4 @@ libstocks_return_code get_stocks(const char *stocks, stock **stock_datas)
 
   case YAHOO_EUROPE:
-
     if (eu_quotes) 
       {
@@ -283,6 +281,6 @@ libstocks_return_code get_stocks(const char *stocks, stock **stock_datas)
         if(eu_quotes_temp==NULL)
     {
-      fprintf(stderr,"Memory allocating error (%s line %d)\n"
-        ,__FILE__, __LINE__);
+                     fprintf(stderr,"Memory allocating error (%s line %d)\n",
+                             __FILE__, __LINE__);
       exit(1);  
     }
@@ -299,6 +297,6 @@ libstocks_return_code get_stocks(const char *stocks, stock **stock_datas)
         if(eu_quotes==NULL)
     {
-      fprintf(stderr,"Memory allocating error (%s line %d)\n"
-        ,__FILE__, __LINE__);
+                   fprintf(stderr,"Memory allocating error (%s line %d)\n",
+                           __FILE__, __LINE__);
       exit(1);  
     }
@@ -315,4 +313,5 @@ libstocks_return_code get_stocks(const char *stocks, stock **stock_datas)
       /* Gets us quotes */
       error = download_stocks(us_quotes, &stocks_tmp, YAHOO_US);
+      free(us_quotes);
       if (error) return error;
     }
@@ -322,4 +321,5 @@ libstocks_return_code get_stocks(const char *stocks, stock **stock_datas)
       /* Gets european quotes */
       error = download_stocks(eu_quotes, &stocks_getted, YAHOO_EUROPE);
+      free(eu_quotes);
       if (error) return error;
 
@@ -339,5 +339,6 @@ libstocks_return_code get_stocks(const char *stocks, stock **stock_datas)
 
   }
-      else (stocks_tmp = stocks_getted);      
+      else
+          (stocks_tmp = stocks_getted);
     }