← Back to branch summary

~ubuntu-branches/ubuntu/karmic/nss/karmic-updates

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/dev/ckhelper.c

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack
  • Date: 2009-06-16 13:23:47 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20090616132347-311ysb8oep74b98y
Tags: 3.12.3-0ubuntu1
https://launchpad.net/bugs/387751
* new upstream release 3.12.3 RTM (NSS_3_12_3_RTM) (LP: #387751)
* adjust patches to changed upstream code base
  - update debian/patches/38_kbsd.patch
* needs nspr >= 4.7.4
  - update debian/control
* update 85_security_load.patch to latest debian version
  - update debian/patches/85_security_load.patch
* add new symbols for 3.12.3
  - update debian/libnss3-1d.symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/lib/dev/ckhelper.c
35
35
 * ***** END LICENSE BLOCK ***** */
36
36
 
37
37
#ifdef DEBUG
38
 
static const char CVS_ID[] = "@(#) $RCSfile: ckhelper.c,v $ $Revision: 1.38 $ $Date: 2008/09/30 04:09:02 $";
 
38
static const char CVS_ID[] = "@(#) $RCSfile: ckhelper.c,v $ $Revision: 1.39 $ $Date: 2009/01/22 01:29:24 $";
39
39
#endif /* DEBUG */
40
40
 
41
41
#ifndef NSSCKEPV_H
133
133
        /* Allocate memory for each attribute. */
134
134
        for (i=0; i<count; i++) {
135
135
            CK_ULONG ulValueLen = obj_template[i].ulValueLen;
136
 
            if (ulValueLen == 0) continue;
137
 
            if (ulValueLen == (CK_ULONG) -1) {
 
136
            if (ulValueLen == 0 || ulValueLen == (CK_ULONG) -1) {
 
137
                obj_template[i].pValue = NULL;
138
138
                obj_template[i].ulValueLen = 0;
139
139
                continue;
140
140
            }