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

src/tcs/rpc/tcstp/rpc_caps_tpm.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2006
  *
  */
 
@@ skipping 23 matching lines @@
         TCPA_CAPABILITY_AREA capArea;
         UINT32 subCapSize;
         BYTE *subCap;
         UINT32 respSize;
         BYTE *resp;
         TSS_RESULT result;
 
         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 %ldd context %x", THREAD_ID, hContext);
 
         if (getData(TCSD_PACKET_TYPE_UINT32, 1, &capArea, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &subCapSize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (subCapSize == 0)
                 subCap = NULL;
         else {
                 subCap = calloc(1, subCapSize);
@@ skipping 39 matching lines @@
         TCS_CONTEXT_HANDLE hContext;
         TPM_AUTH ownerAuth;
         TCPA_VERSION version;
         UINT32 nonVol;
         UINT32 vol;
         TSS_RESULT result;
 
         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_AUTH, 1, &ownerAuth, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         MUTEX_LOCK(tcsp_lock);
 
         result = TCSP_GetCapabilityOwner_Internal(hContext, &ownerAuth, &version, &nonVol, &vol);
 
         MUTEX_UNLOCK(tcsp_lock);
 
@@ skipping 26 matching lines @@
         UINT32 subCapSize;
         BYTE *subCap;
         UINT32 valueSize;
         BYTE *value;
         TSS_RESULT result;
         TPM_AUTH ownerAuth, *pOwnerAuth;
 
         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, &capArea, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         if (getData(TCSD_PACKET_TYPE_UINT32, 2, &subCapSize, 0, &data->comm))
                 return TCSERR(TSS_E_INTERNAL_ERROR);
 
         if (subCapSize == 0)
                 subCap = NULL;
         else {
                 subCap = calloc(1, subCapSize);
                 if (subCap == NULL) {
                         LogError("malloc of %u bytes failed.", subCapSize);
                         return TCSERR(TSS_E_OUTOFMEMORY);
                 }
                 if (getData(TCSD_PACKET_TYPE_PBYTE, 3, subCap, subCapSize, &data->comm)) {
                         free(subCap);
                         return TCSERR(TSS_E_INTERNAL_ERROR);
                 }
         }
 
-        if (getData(TCSD_PACKET_TYPE_UINT32, 4, &valueSize, 0, &data->comm))
+        if (getData(TCSD_PACKET_TYPE_UINT32, 4, &valueSize, 0, &data->comm)) {
+                free(subCap);
                 return TCSERR(TSS_E_INTERNAL_ERROR);
+        }
 
         if (valueSize == 0)
                 value = NULL;
         else {
                 value = calloc(1, valueSize);
                 if (value == NULL) {
                         free(subCap);
                         LogError("malloc of %u bytes failed.", valueSize);
                         return TCSERR(TSS_E_OUTOFMEMORY);
                 }
@@ skipping 25 matching lines @@
                         if (setData(TCSD_PACKET_TYPE_AUTH, 0, pOwnerAuth, 0, &data->comm)) {
                                 return TCSERR(TSS_E_INTERNAL_ERROR);
                         }
                 }
         } else
                 initData(&data->comm, 0);
 
         data->comm.hdr.u.result = result;
         return TSS_SUCCESS;
 }