← Back to branch summary

~ubuntu-branches/ubuntu/raring/nss/raring-security

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/ckfw/sessobj.c

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2010-03-25 13:46:06 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20100325134606-bl6liuok2w9l7snv
Tags: 3.12.6-0ubuntu1
* New upstream release 3.12.6 RTM (NSS_3_12_6_RTM)
  - fixes CVE-2009-3555 aka US-CERT VU#120541
* Adjust patches to changed upstream code base
  - update debian/patches/38_kbsd.patch
  - update debian/patches/38_mips64_build.patch
  - update debian/patches/85_security_load.patch
* Remove patches that are merged upstream
  - delete debian/patches/91_nonexec_stack.patch
  - update debian/patches/series
* Bump nspr dependency to 4.8
  - update debian/control
* Add new symbols for 3.12.6
  - update debian/libnss3-1d.symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/lib/ckfw/sessobj.c
35
35
 * ***** END LICENSE BLOCK ***** */
36
36
 
37
37
#ifdef DEBUG
38
 
static const char CVS_ID[] = "@(#) $RCSfile: sessobj.c,v $ $Revision: 1.14 $ $Date: 2009/02/09 07:55:53 $";
 
38
static const char CVS_ID[] = "@(#) $RCSfile: sessobj.c,v $ $Revision: 1.15 $ $Date: 2009/06/05 00:22:04 $";
39
39
#endif /* DEBUG */
40
40
 
41
41
/*
706
706
    nss_ZFreeIf(n.data);
707
707
    return CKR_HOST_MEMORY;
708
708
  }
709
 
 
710
 
  rt = (CK_ATTRIBUTE_TYPE_PTR)nss_ZRealloc(obj->types, (obj->n + 1));
711
 
  if( (CK_ATTRIBUTE_TYPE_PTR)NULL == rt ) {
712
 
    nss_ZFreeIf(n.data);
713
 
    obj->attributes = (NSSItem *)nss_ZRealloc(ra, sizeof(NSSItem) * obj->n);
714
 
    if (!obj->attributes) {
715
 
      return CKR_GENERAL_ERROR;
716
 
    }
717
 
    return CKR_HOST_MEMORY;
718
 
  }
719
 
 
720
709
  obj->attributes = ra;
 
710
 
 
711
  rt = (CK_ATTRIBUTE_TYPE_PTR)nss_ZRealloc(obj->types, 
 
712
                                      sizeof(CK_ATTRIBUTE_TYPE) * (obj->n + 1));
 
713
  if (!rt) {
 
714
    nss_ZFreeIf(n.data);
 
715
    return CKR_HOST_MEMORY;
 
716
  }
 
717
 
721
718
  obj->types = rt;
722
719
  obj->attributes[obj->n] = n;
723
720
  obj->types[obj->n] = attribute;