← Back to branch summary

~ubuntu-branches/ubuntu/raring/gnupg2/raring

« back to all changes in this revision

Viewing changes to debian/patches/03-gpgsm-realloc.diff

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2010-11-16 11:30:31 UTC
  • mfrom: (7.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20101116113031-3y0603x6m3bw78s1
Tags: 2.0.14-2ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Add udev rules to give gpg access to some smartcard readers;
    Debian #543217.
    . debian/gnupg2.dev: udev rules to set ACLs on SCM smartcard readers.
    . debian/rules: Call dh_installudev.
  - debian/control: Rename Vcs-* to XS-Debian-Vcs-*.
* debian/patches/CVE-2010-2547.patch: dropped, now in
  03-gpgsm-realloc.diff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/03-gpgsm-realloc.diff
 
1
--- a/kbx/keybox-blob.c   (revision 5367)
 
2
+++ b/kbx/keybox-blob.c   (working copy)
 
3
@@ -898,6 +898,7 @@
 
4
               rc = gpg_error_from_syserror ();
 
5
               goto leave;
 
6
             }
 
7
+          names = tmp;
 
8
         }
 
9
       names[blob->nuids++] = p;
 
10
       if (!i && (p=x509_email_kludge (p)))
 
11