diff cinst/main.c @ 978:d92b1594e974

Merged.
author Emanuel Schuetze <emanuel@intevation.de>
date Fri, 29 Aug 2014 13:10:11 +0200
parents 76c410aff382
children 78798d3af8f0
line wrap: on
line diff
--- a/cinst/main.c	Fri Aug 29 13:09:40 2014 +0200
+++ b/cinst/main.c	Fri Aug 29 13:10:11 2014 +0200
@@ -261,6 +261,7 @@
     }
 
   all_valid_certs = get_certs_from_list (certificate_list, list_len);
+  free (certificate_list);
 
   if (!all_valid_certs)
     {
@@ -280,6 +281,7 @@
         }
 #endif
       ret = write_stores_nss (NULL, all_valid_certs);
+      strv_free (all_valid_certs);
       return ret;
     }
 
@@ -319,6 +321,8 @@
         }
     }
 
+  strv_free (all_valid_certs);
+
 #ifdef WIN32
   ret = write_stores_win (to_install, to_remove);
   if (ret != 0)
@@ -335,7 +339,6 @@
   /* Make valgrind happy */
   strv_free (to_install);
   strv_free (to_remove);
-  free (certificate_list);
 
   return 0;
 }

http://wald.intevation.org/projects/trustbridge/