[pkg-opensc-commit] [opensc] 14/23: fixed memory leak of reader's vendor name

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository opensc.

commit 46efb02fecacfede1515a2dc9bc7d2c1fbc2ba72
Author: Frank Morgner <frankmorgner at gmail.com>
Date:   Thu May 26 14:36:55 2016 +0200

    fixed memory leak of reader's vendor name
---
 src/libopensc/ctx.c         |  2 ++
 src/libopensc/reader-pcsc.c | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/libopensc/ctx.c b/src/libopensc/ctx.c
index 8b2acf8..508e275 100644
--- a/src/libopensc/ctx.c
+++ b/src/libopensc/ctx.c
@@ -54,6 +54,8 @@ int _sc_delete_reader(sc_context_t *ctx, sc_reader_t *reader)
 			reader->ops->release(reader);
 	if (reader->name)
 		free(reader->name);
+	if (reader->vendor)
+		free(reader->vendor);
 	list_delete(&ctx->readers, reader);
 	free(reader);
 	return SC_SUCCESS;
diff --git a/src/libopensc/reader-pcsc.c b/src/libopensc/reader-pcsc.c
index 6705d86..94af43e 100644
--- a/src/libopensc/reader-pcsc.c
+++ b/src/libopensc/reader-pcsc.c
@@ -1279,6 +1279,8 @@ static int pcsc_detect_readers(sc_context_t *ctx)
 		if (reader != NULL) {
 			if (reader->name)
 				free(reader->name);
+			if (reader->vendor)
+				free(reader->vendor);
 			free(reader);
 		}
 		goto out;
@@ -2497,14 +2499,14 @@ int cardmod_use_reader(sc_context_t *ctx, void * pcsc_context_handle, void * pcs
 		goto out;
 
 	err1:
-		if (priv != NULL)
-		{
+		if (priv != NULL) {
 			free(priv);
 		}
-		if (reader != NULL)
-		{
+		if (reader != NULL) {
 			if (reader->name)
 				free(reader->name);
+			if (reader->vendor)
+				free(reader->vendor);
 			free(reader);
 		}
 	}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/opensc.git