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

src/tcs/tcs_pbg.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2007
  *
  */
 
@@ skipping 450 matching lines @@
                 UnloadBlob_UINT32(&offset1, len1, b);
                 if ((*blob1 = malloc(*len1)) == NULL) {
                         LogError("malloc of %u bytes failed", *len1);
                         return TCSERR(TSS_E_OUTOFMEMORY);
                 }
 
                 UnloadBlob(&offset1, *len1, b, *blob1);
 
                 UnloadBlob_UINT32(&offset1, len2, b);
                 if ((*blob2 = malloc(*len2)) == NULL) {
+                        free(*blob1);
                         LogError("malloc of %u bytes failed", *len2);
                         return TCSERR(TSS_E_OUTOFMEMORY);
                 }
 
                 UnloadBlob(&offset1, *len2, b, *blob2);
 
                 break;
         }
         /* TPM BLOB: BLOB, optional AUTH, AUTH
          * return:   UINT32 *, BYTE **, optional AUTH, AUTH */
@@ skipping 61 matching lines @@
                         return TCSERR(TSS_E_OUTOFMEMORY);
                 }
                 *len1 = offset1;
 
                 UnloadBlob(&offset2, offset1, b, *blob1);
 
                 /* offset2 points to the stuff after the key */
                 UnloadBlob_UINT32(&offset2, len2, b);
 
                 if ((*blob2 = malloc(*len2)) == NULL) {
+                        free(*blob1);
                         LogError("malloc of %u bytes failed", *len2);
                         return TCSERR(TSS_E_OUTOFMEMORY);
                 }
 
                 UnloadBlob(&offset2, *len2, b, *blob2);
 
                 if (auth1)
                         UnloadBlob_Auth(&offset2, b, auth1);
                 UnloadBlob_Auth(&offset2, b, auth2);
 
@@ skipping 1611 matching lines @@
                 break;
         }
 #endif
         default:
                 LogError("Unknown ordinal: 0x%x", ordinal);
                 break;
         }
 
         return result;
 }