From 331db14476f4ec70beff3e9d65d47ec0e74897af Mon Sep 17 00:00:00 2001
From: "emaldona%redhat.com"
 <emaldona%redhat.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 15 Mar 2011 17:45:21 +0000
Subject: [PATCH] Bug 640992 - nss_cms_before_data loses the child's content
 pointer on recursive decoding, r=rrelyea

git-svn-id: svn://10.0.0.236/trunk@262047 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/security/nss/lib/smime/cmsdecode.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mozilla/security/nss/lib/smime/cmsdecode.c b/mozilla/security/nss/lib/smime/cmsdecode.c
index df6328f7410..602d59a6005 100644
--- a/mozilla/security/nss/lib/smime/cmsdecode.c
+++ b/mozilla/security/nss/lib/smime/cmsdecode.c
@@ -37,7 +37,7 @@
 /*
  * CMS decoding.
  *
- * $Id: cmsdecode.c,v 1.12 2011-02-11 01:53:17 emaldona%redhat.com Exp $
+ * $Id: cmsdecode.c,v 1.13 2011-03-15 17:45:21 emaldona%redhat.com Exp $
  */
 
 #include "cmslocal.h"
@@ -291,6 +291,9 @@ nss_cms_before_data(NSSCMSDecoderContext *p7dcx)
     if (childp7dcx->content.pointer == NULL)
 	goto loser;
 
+    /* give the parent a copy of the pointer so that it doesn't get lost */
+    cinfo->content.pointer = childp7dcx->content.pointer;
+
     /* start the child decoder */
     childp7dcx->dcx = SEC_ASN1DecoderStart(poolp, childp7dcx->content.pointer, 
                                            template);