Upgrade from trousers 0.3.3 to 0.3.6 and from testsuite 0.2 to 0.3.

src/tspi/rpc/hosttable.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004
  *
  */
 
@@ skipping 17 matching lines @@
         if (ht == NULL) {
                 LogError("malloc of %zd bytes failed.", sizeof(struct host_table));
                 return TSPERR(TSS_E_OUTOFMEMORY);
         }
 
         MUTEX_INIT(ht->lock);
 
         return TSS_SUCCESS;
 }
 
+#ifdef SOLARIS
+#pragma init(_init)
+void _init(void)
+#else
 void __attribute__ ((constructor)) my_init(void)
+#endif
 {
         host_table_init();
         __tspi_obj_list_init();
 }
 
-#if 0
 void
 host_table_final()
 {
         struct host_table_entry *hte, *next = NULL;
 
         MUTEX_LOCK(ht->lock);
 
         for (hte = ht->entries; hte; hte = next) {
                 if (hte)
                         next = hte->next;
+                if (hte->hostname)
+                        free(hte->hostname);
+                if (hte->comm.buf)
+                        free(hte->comm.buf);
                 free(hte);
         }
 
         MUTEX_UNLOCK(ht->lock);
 
         free(ht);
         ht = NULL;
 }
 
+#ifdef SOLARIS
+#pragma fini(_fini)
+void _fini(void)
+#else
 void __attribute__ ((destructor)) my_fini(void)
+#endif
 {
         host_table_final();
 }
-#endif
 
 TSS_RESULT
 __tspi_add_table_entry(TSS_HCONTEXT tspContext, BYTE *host, int type, struct host_table_entry **ret)
 {
         struct host_table_entry *entry, *tmp;
 
         entry = calloc(1, sizeof(struct host_table_entry));
         if (entry == NULL) {
                 LogError("malloc of %zd bytes failed.", sizeof(struct host_table_entry));
                 return TSPERR(TSS_E_OUTOFMEMORY);
@@ skipping 10 matching lines @@
                 return TSPERR(TSS_E_OUTOFMEMORY);
         }
         MUTEX_INIT(entry->lock);
 
         MUTEX_LOCK(ht->lock);
 
         for (tmp = ht->entries; tmp; tmp = tmp->next) {
                 if (tmp->tspContext == tspContext) {
                         LogError("Tspi_Context_Connect attempted on an already connected context!");
                         MUTEX_UNLOCK(ht->lock);
+                        free(entry->hostname);
                         free(entry->comm.buf);
                         free(entry);
                         return TSPERR(TSS_E_CONNECTION_FAILED);
                 }
         }
 
         if( ht->entries == NULL ) {
                 ht->entries = entry;
         } else {
                 for (tmp = ht->entries; tmp->next; tmp = tmp->next)
@@ skipping 13 matching lines @@
         struct host_table_entry *hte, *prev = NULL;
 
         MUTEX_LOCK(ht->lock);
 
         for (hte = ht->entries; hte; prev = hte, hte = hte->next) {
                 if (hte->tspContext == tspContext) {
                         if (prev != NULL)
                                 prev->next = hte->next;
                         else
                                 ht->entries = hte->next;
+                        if (hte->hostname)
+                                free(hte->hostname);
                         free(hte->comm.buf);
                         free(hte);
                         break;
                 }
         }
 
         MUTEX_UNLOCK(ht->lock);
 }
 
 struct host_table_entry *
@@ skipping 16 matching lines @@
         return index;
 }
 
 void
 put_table_entry(struct host_table_entry *entry)
 {
         if (entry)
                 MUTEX_UNLOCK(entry->lock);
 }