From 835683a55985198470737e2125d59a9b42c482ee Mon Sep 17 00:00:00 2001 From: "relyea%netscape.com" Date: Tue, 9 Apr 2002 18:25:10 +0000 Subject: [PATCH] bug 136253 : make code tolerant if rainbow's use of GetAttribute. git-svn-id: svn://10.0.0.236/branches/NSS_3_4_BRANCH@118556 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/lib/dev/ckhelper.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mozilla/security/nss/lib/dev/ckhelper.c b/mozilla/security/nss/lib/dev/ckhelper.c index 3ec3acb4b64..7637d719e20 100644 --- a/mozilla/security/nss/lib/dev/ckhelper.c +++ b/mozilla/security/nss/lib/dev/ckhelper.c @@ -32,7 +32,7 @@ */ #ifdef DEBUG -static const char CVS_ID[] = "@(#) $RCSfile: ckhelper.c,v $ $Revision: 1.17 $ $Date: 2002-03-15 19:51:27 $ $Name: not supported by cvs2svn $"; +static const char CVS_ID[] = "@(#) $RCSfile: ckhelper.c,v $ $Revision: 1.17.2.1 $ $Date: 2002-04-09 18:25:10 $ $Name: not supported by cvs2svn $"; #endif /* DEBUG */ #ifndef DEV_H @@ -177,7 +177,9 @@ nssCKObject_GetAttributes * of the attributes we passed. For those tokens read them one at * a time */ for (i=0; i < count; i++) { - if (obj_template[i].ulValueLen == 0) { + if ((obj_template[i].ulValueLen == 0) + || (obj_template[i].ulValueLen == -1)) { + obj_template[i].ulValueLen=0; (void) nssCKObject_GetAttributes(object,&obj_template[i], 1, arenaOpt, session, slot); }