[Trousers-scm] [GIT] Trousers master branch updated. TROUSERS_0_3_13-12-g0317141

[Hon Ching(Vicky) Lo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Trousers".

The branch, master has been updated
via 0317141799e03798d42a42cf84d7680159d63df3 (commit)
via 46c3fd98d1031d13aa3e56c3bf81bf681969238a (commit)
from c637981cf34acc3481797482249ad2cec3f9ed0b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://trousers.git.sourceforge.net/git/gitweb.cgi?p=trousers/trousers;a=commitdiff;h=0317141799e03798d42a42cf84d7680159d63df3

commit 0317141799e03798d42a42cf84d7680159d63df3
Author: Krzysztof Kotlenga <***@sims.pl>
Date: Wed Nov 5 18:02:01 2014 -0500

Fixed possible double free when freeing context memory

Use the right free call or else it will crash when freeing context
memory and an owner evict key has been loaded.

diff --git a/src/tspi/tspi_ps.c b/src/tspi/tspi_ps.c
index bde3e53..237fadf 100644
--- a/src/tspi/tspi_ps.c
+++ b/src/tspi/tspi_ps.c
@@ -107,7 +107,7 @@ Tspi_Context_LoadKeyByUUID(TSS_HCONTEXT tspContext, /* in */

result = obj_rsakey_set_pubkey(*phKey, FALSE, rgbPubKey);

- free(rgbPubKey);
+ free_tspi(tspContext,rgbPubKey);
if (result != TSS_SUCCESS)
return result;
} else {

http://trousers.git.sourceforge.net/git/gitweb.cgi?p=trousers/trousers;a=commitdiff;h=46c3fd98d1031d13aa3e56c3bf81bf681969238a

commit 46c3fd98d1031d13aa3e56c3bf81bf681969238a
Author: Krzysztof Kotlenga <***@sims.pl>
Date: Mon Nov 3 16:31:41 2014 -0500

Removed misguided attempt to free memory in Tspi_Context_Close

The docs and note in the code state that Tspi_Context_FreeMemory
should be called explicitly before calling Close. Currently it
does not free memory anyway, because Tspi_Context_FreeMemory will
refuse to work on an already closed context.

Originally introduced in 6e789a06f34d51cd8c9da6138e17a5a8db35a129,
turned into no-op in 59af8e1b2d5537d82fce1d4990a880f7390fb248.

diff --git a/src/tspi/tspi_context.c b/src/tspi/tspi_context.c
index 786787f..fe9317b 100644
--- a/src/tspi/tspi_context.c
+++ b/src/tspi/tspi_context.c
@@ -55,8 +55,6 @@ Tspi_Context_Close(TSS_HCONTEXT tspContext) /* in */
/* Destroy all objects */
obj_close_context(tspContext);

- Tspi_Context_FreeMemory(tspContext, NULL);
-
/* close the ps file */
PS_close();


-----------------------------------------------------------------------

Summary of changes:
src/tspi/tspi_context.c | 2 --
src/tspi/tspi_ps.c | 2 +-
2 files changed, 1 insertions(+), 3 deletions(-)


hooks/post-receive