[pkg-opensc-commit] [engine-pkcs11] 03/03: Cherrypick 0961d72 to prevent set_init_args memory leak.

[Eric Dorland]

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

eric pushed a commit to branch master
in repository engine-pkcs11.

commit 078e06361be63ce19cb248bd46b0fa4011e34d1e
Author: Eric Dorland <eric at debian.org>
Date:   Sat Nov 14 18:06:52 2015 -0500

    Cherrypick 0961d72 to prevent set_init_args memory leak.
    
    Closes: #802118
---
 debian/changelog                                     |  6 +++++-
 ...otential-memory-leak-when-calling-set_init_.patch | 20 ++++++++++++++++++++
 debian/patches/series                                |  1 +
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ba07ca0..2778c8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,12 @@ engine-pkcs11 (0.2.0-2) unstable; urgency=medium
   * debian/libengine-pkcs11-openssl.links: Fix
     /usr/lib/engines/engine_pkcs11.so symlink for new engine name. Thanks
     Marga Manterola. (Closes: #804693)
+  *
+    debian/patches/0001-Prevent-potential-memory-leak-when-calling-set_init_.patch:
+    Cherrypick 0961d72 to prevent set_init_args memory leak. (Closes:
+    #802118)
 
- --
+ -- Eric Dorland <eric at debian.org>  Sat, 14 Nov 2015 18:06:03 -0500
 
 engine-pkcs11 (0.2.0-1) unstable; urgency=medium
 
diff --git a/debian/patches/0001-Prevent-potential-memory-leak-when-calling-set_init_.patch b/debian/patches/0001-Prevent-potential-memory-leak-when-calling-set_init_.patch
new file mode 100644
index 0000000..c836492
--- /dev/null
+++ b/debian/patches/0001-Prevent-potential-memory-leak-when-calling-set_init_.patch
@@ -0,0 +1,20 @@
+From: Persmule <persmule at gmail.com>
+Date: Fri, 16 Oct 2015 17:11:52 +0800
+Subject: * Prevent potential memory leak when calling set_init_args.
+
+---
+ src/engine_pkcs11.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/engine_pkcs11.c b/src/engine_pkcs11.c
+index 9e13a0c..4e07e5d 100644
+--- a/src/engine_pkcs11.c
++++ b/src/engine_pkcs11.c
+@@ -158,6 +158,7 @@ static int get_pin(UI_METHOD * ui_method, void *callback_data)
+ 
+ int set_init_args(const char *init_args_orig)
+ {
++	free(init_args);
+ 	init_args = init_args_orig ? strdup(init_args_orig) : NULL;
+ 	return 1;
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b3dfbad
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Prevent-potential-memory-leak-when-calling-set_init_.patch

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