[svn] ksba - r262 - trunk/src

[svn author marcus]

Author: marcus
Date: 2006-12-21 00:02:05 +0100 (Thu, 21 Dec 2006)
New Revision: 262

Modified:
   trunk/src/ChangeLog
   trunk/src/cms-parser.c
   trunk/src/cms.c
Log:
2006-12-20  Marcus Brinkmann  <marcus at g10code.de>

	* cms.c (ksba_cms_release): Release CMS->signer_info.
	* cms-parser.c (_ksba_cms_parse_signed_data_part_2): On failure,
	release SI.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2006-12-18 01:04:02 UTC (rev 261)
+++ trunk/src/ChangeLog	2006-12-20 23:02:05 UTC (rev 262)
@@ -1,3 +1,9 @@
+2006-12-20  Marcus Brinkmann  <marcus at g10code.de>
+
+	* cms.c (ksba_cms_release): Release CMS->signer_info.
+	* cms-parser.c (_ksba_cms_parse_signed_data_part_2): On failure,
+	release SI.
+
 2006-12-18  Marcus Brinkmann  <marcus at g10code.de>
 
 	* cert.c (ksba_cert_release): Release cert->root and

Modified: trunk/src/cms-parser.c
===================================================================
--- trunk/src/cms-parser.c	2006-12-18 01:04:02 UTC (rev 261)
+++ trunk/src/cms-parser.c	2006-12-20 23:02:05 UTC (rev 262)
@@ -753,11 +753,15 @@
          signature.  Thus we have to allow for EOF here */
       if (gpg_err_code (err) == GPG_ERR_EOF)
         {
+	  xfree (si);
           err = 0;
           break;
         }
       if (err)
-        return err;
+	{
+	  xfree (si);
+	  return err;
+	}
 
       *si_tail = si;
       si_tail = &si->next;

Modified: trunk/src/cms.c
===================================================================
--- trunk/src/cms.c	2006-12-18 01:04:02 UTC (rev 261)
+++ trunk/src/cms.c	2006-12-20 23:02:05 UTC (rev 262)
@@ -511,9 +511,10 @@
     {
       struct signer_info_s *tmp = cms->signer_info->next;
       _ksba_asn_release_nodes (cms->signer_info->root);
-       xfree (cms->signer_info->image);
-       xfree (cms->signer_info->cache.digest_algo);
-       cms->signer_info = tmp;
+      xfree (cms->signer_info->image);
+      xfree (cms->signer_info->cache.digest_algo);
+      xfree (cms->signer_info);
+      cms->signer_info = tmp;
     }
   release_value_tree (cms->recp_info);
   while (cms->sig_val)