← Back to branch summary

~ubuntu-branches/ubuntu/lucid/gnutls26/lucid

« back to all changes in this revision

Viewing changes to lib/opencdk/read-packet.c

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Metzler
  • Date: 2009-09-26 10:33:52 UTC
  • mfrom: (1.1.8 upstream) (12.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20090926103352-aqhy8avw3jyaf2n5
Tags: 2.8.4-1
* New upstream version.
  + Drop debian/patches/15_openpgp.diff.
* Sync priorities with override file, libgnutls26 has been bumped from
  important to standard.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/opencdk/read-packet.c
836
836
      *ret_pt = pt = cdk_realloc (pt, sizeof *pt + pt->namelen + 2);
837
837
      if (!pt)
838
838
        return CDK_Out_Of_Core;
839
 
      pt->name = (void*)pt + sizeof(*pt);
 
839
      pt->name = (char*)pt + sizeof(*pt);
840
840
      rc = stream_read (inp, pt->name, pt->namelen, &nread);
841
841
      if (rc)
842
842
        return rc;
998
998
                                     + pkt->pktlen + 16 + 1);
999
999
      if (!pkt->pkt.user_id)
1000
1000
        return CDK_Out_Of_Core;
1001
 
      pkt->pkt.user_id->name = (void*)pkt->pkt.user_id + sizeof(*pkt->pkt.user_id);
 
1001
      pkt->pkt.user_id->name = (char*)pkt->pkt.user_id + sizeof(*pkt->pkt.user_id);
1002
1002
 
1003
1003
      rc = read_attribute (inp, pktlen, pkt->pkt.user_id);
1004
1004
      pkt->pkttype = CDK_PKT_ATTRIBUTE;
1009
1009
                                     + pkt->pktlen + 1);
1010
1010
      if (!pkt->pkt.user_id)
1011
1011
        return CDK_Out_Of_Core;
1012
 
      pkt->pkt.user_id->name = (void*)pkt->pkt.user_id + sizeof(*pkt->pkt.user_id);
 
1012
      pkt->pkt.user_id->name = (char*)pkt->pkt.user_id + sizeof(*pkt->pkt.user_id);
1013
1013
      rc = read_user_id (inp, pktlen, pkt->pkt.user_id);
1014
1014
      break;
1015
1015