[Gpg4win-commits] r1486 - in trunk: . patches/gnupg2-2.0.16

[scm-commit@wald.intevation.org]

Author: werner
Date: 2010-07-23 16:13:23 +0200 (Fri, 23 Jul 2010)
New Revision: 1486

Added:
   trunk/patches/gnupg2-2.0.16/03-kbx-realloc.patch
Modified:
   trunk/Makefile.am
Log:
Fix kbx-realloc problem


Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2010-07-22 18:55:37 UTC (rev 1485)
+++ trunk/Makefile.am	2010-07-23 14:13:23 UTC (rev 1486)
@@ -61,6 +61,7 @@
 	patches/gnupg2-2.0.14/02-scd-no-service.patch \
 	patches/gnupg2-2.0.16/01-estream.patch \
 	patches/gnupg2-2.0.16/02-gpgtar.patch \
+        patches/gnupg2-2.0.16/03-kbx-realloc.patch \
 	patches/dirmngr-1.0.3/01-ldaphttp.patch \
 	patches/gpgol-0.9.91/01-gpgme.patch \
         patches/gpa-0.9.0/01-title-prop.patch \

Added: trunk/patches/gnupg2-2.0.16/03-kbx-realloc.patch
===================================================================
--- trunk/patches/gnupg2-2.0.16/03-kbx-realloc.patch	2010-07-22 18:55:37 UTC (rev 1485)
+++ trunk/patches/gnupg2-2.0.16/03-kbx-realloc.patch	2010-07-23 14:13:23 UTC (rev 1486)
@@ -0,0 +1,26 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+This patch is required for all GnuPG versions < 2.0.17.  It applies to
+2.0.16 but should apply to many older versions as well.
+
+
+kbx/
+2010-07-23  Werner Koch  <wk at g10code.com>
+
+       * keybox-blob.c (_keybox_create_x509_blob): Fix reallocation bug.
+
+
+--- kbx/keybox-blob.c   (revision 5367)
++++ kbx/keybox-blob.c   (working copy)
+@@ -898,6 +898,7 @@
+               rc = gpg_error_from_syserror ();
+               goto leave;
+             }
++          names = tmp;
+         }
+       names[blob->nuids++] = p;
+       if (!i && (p=x509_email_kludge (p)))
+
+


Property changes on: trunk/patches/gnupg2-2.0.16/03-kbx-realloc.patch
___________________________________________________________________
Name: svn:executable
   + *