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

src/tcs/rpc/tcstp/rpc_quote2.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2007
  *
  */
 
@@ skipping 37 matching lines @@
         
         UINT32 sigSize;
         BYTE *sig;
         TSS_RESULT result;
 
         int i;
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 0, &hContext, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
-        LogDebugFn("thread %zd context %x", THREAD_ID, hContext);
+        LogDebugFn("thread %ld context %x", THREAD_ID, hContext);
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 1, &hKey, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_NONCE, 2, &antiReplay, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT32, 3, &pcrDataSizeIn, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         pcrDataIn = (BYTE *)calloc(1, pcrDataSizeIn);
         if (pcrDataIn == NULL) {
                 LogError("malloc of %u bytes failed.", pcrDataSizeIn);
                 return TCSERR(TSS_E_OUTOFMEMORY);
         }
         if (getData(TCSD_PACKET_TYPE_PBYTE, 4, pcrDataIn, pcrDataSizeIn, &data->comm)) {
                 free(pcrDataIn);
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         }
-        if (getData(TCSD_PACKET_TYPE_BOOL,5,&addVersion, 0, &data->comm))
+        if (getData(TCSD_PACKET_TYPE_BOOL,5,&addVersion, 0, &data->comm)) {
+                free(pcrDataIn);
                 return TCSERR(TSS_E_INTERNAL_ERROR);
-        
+        }
         result = getData(TCSD_PACKET_TYPE_AUTH, 6, &privAuth, 0, &data->comm);
         if (result == TSS_TCP_RPC_BAD_PACKET_TYPE)
                 pPrivAuth = NULL;
         else if (result) {
                 free(pcrDataIn);
                 return result;
         } else
                 pPrivAuth = &privAuth;
 
         MUTEX_LOCK(tcsp_lock);
@@ skipping 65 matching lines @@
                 free(pcrDataOut);
                 if (versionInfoSize >0)
                         free(versionInfo);
                 free(sig);
         } else
                 initData(&data->comm, 0);
 
         data->comm.hdr.u.result = result;
         return TSS_SUCCESS;
 }