]> Dogcows Code - chaz/homebank/commitdiff
Merge branch 'master' into ext-perl ext-perl
authorCharles McGarvey <chazmcgarvey@brokenzipper.com>
Mon, 2 Sep 2019 23:58:34 +0000 (17:58 -0600)
committerCharles McGarvey <chazmcgarvey@brokenzipper.com>
Mon, 2 Sep 2019 23:58:34 +0000 (17:58 -0600)
1  2 
configure.ac
src/hb-archive.c
src/homebank.h

diff --cc configure.ac
Simple merge
index 1f6521411e88407ad3a04c57184caefca8ea31f4,cbb732883fd598b6d53f70e06dd497dc69a80a7a..7c4264fbb4289868badd8a52824187518f59803d
  extern struct HomeBank *GLOBALS;
  
  
 -      if(item != NULL)
+ /* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */
+ static void
+ da_archive_clean(Archive *item)
+ {
+       if(item != NULL)
+       {
+               if(item->memo != NULL)
+               {
+                       g_free(item->memo);
+                       item->memo = NULL;
+               }
+               //5.3 added as it was a leak
+               if(item->tags != NULL)
+               {
+                       g_free(item->tags);
+                       item->tags = NULL;
+               }
+               if(item->splits != NULL)
+               {
+                       da_split_destroy(item->splits);
+                       item->splits = NULL;
+                       item->flags &= ~(OF_SPLIT); //Flag that Splits are cleared
+               }
+       }
+ }
+ void da_archive_free(Archive *item)
+ {
 -              g_free(item);
++      if(rc_unref(item))
+       {
+               da_archive_clean(item);
++              rc_free(item);
+       }
+ }
  Archive *da_archive_malloc(void)
  {
  Archive *item;
diff --cc src/homebank.h
Simple merge
This page took 0.020918 seconds and 4 git commands to generate.