Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for 54088 . Don't try to encode attributes with no value. r=wtc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@149908 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jpierre%netscape.com
2003-12-02 05:05:30 +00:00
parent 72ce3f471b
commit ff42e217a1
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/security/nss/lib/smime/cmsattr.c
View File

@@ -34,7 +34,7 @@
/*
* CMS attributes.
*
* $Id: cmsattr.c,v 1.6 2003-09-19 04:14:50 jpierre%netscape.com Exp $
* $Id: cmsattr.c,v 1.7 2003-12-02 05:05:30 jpierre%netscape.com Exp $
*/
#include "cmslocal.h"
@@ -217,9 +217,12 @@ cms_attr_choose_attr_value_template(void *src_or_dest, PRBool encoding)
attribute = (NSSCMSAttribute *)src_or_dest;
if (encoding && attribute->encoded)
/* we're encoding, and the attribute value is already encoded. */
return SEC_ASN1_GET(SEC_AnyTemplate);
if (encoding && (!attribute->values || !attribute->values[0] ||
attribute->encoded)) {
/* we're encoding, and the attribute has no value or the attribute
* value is already encoded. */
return SEC_ASN1_GET(SEC_AnyTemplate);
}
/* get attribute's typeTag */
oiddata = attribute->typeTag;