[Cvs-cvs] ccvs/src ChangeLog gpg.c

[Larry Jones]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Larry Jones <scjones>   11/03/30 19:50:20

Modified files:
        src            : ChangeLog gpg.c 

Log message:
        * gpg.c (parse_signature_subpacket): Correct spout->raw memory
        allocation. 
        (Reported by David Taylor <address@hidden>.)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3646&r2=1.3647
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/gpg.c?cvsroot=cvs&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3646
retrieving revision 1.3647
diff -u -b -r1.3646 -r1.3647
--- ChangeLog   21 Oct 2010 15:21:15 -0000      1.3646
+++ ChangeLog   30 Mar 2011 19:50:19 -0000      1.3647
@@ -1,3 +1,9 @@
+2011-03-30  Larry Jones  <address@hidden>
+
+       * gpg.c (parse_signature_subpacket): Correct spout->raw memory
+       allocation. 
+       (Reported by David Taylor <address@hidden>.)
+
 2010-10-21  Larry Jones  <address@hidden>
 
        * rcs.c (apply_rcs_changes): Correct deltatext position sanity

Index: gpg.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/gpg.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gpg.c       24 May 2006 16:38:50 -0000      1.4
+++ gpg.c       30 Mar 2011 19:50:19 -0000      1.5
@@ -403,8 +403,8 @@
   uint32_t splen;
   size_t raw_idx = 0;
 
-  /* Enough to store the subpacket length.  */
-  spout->raw = xmalloc (4);
+  /* Enough to store the subpacket header.  */
+  spout->raw = xmalloc (5);
 
   if ((rc = read_u8 (bpin, &c)))
     return rc;
@@ -435,7 +435,7 @@
     error (1, 0, "Received zero length subpacket in OpenPGP signature.");
 
   /* Allocate enough bytes for the rest of the subpacket.  */
-  spout->raw = xrealloc (spout->raw, splen);
+  spout->raw = xrealloc (spout->raw, raw_idx + splen);
 
   /* Read the subpacket type.  */
   if ((rc = read_u8 (bpin, &c)))