[src/trunk]: src/crypto/dist/ipsec-tools/src/racoon From Rainer Weikusat <rwe...

[tteras <tteras%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/94aa2d0b9f06
branches:  trunk
changeset: 772390:94aa2d0b9f06
user:      tteras <tteras%NetBSD.org@localhost>
date:      Sun Jan 01 17:31:42 2012 +0000

description:
>From Rainer Weikusat <rweikusat%mobileactivedefense.com@localhost>: Fix one byte too
short memory allocation in isakmp_unity.c:splitnet_list_2str().

diffstat:

 crypto/dist/ipsec-tools/src/racoon/isakmp_unity.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r e08e878b694b -r 94aa2d0b9f06 crypto/dist/ipsec-tools/src/racoon/isakmp_unity.c
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_unity.c Sun Jan 01 16:14:11 2012 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_unity.c Sun Jan 01 17:31:42 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isakmp_unity.c,v 1.9 2007/10/19 03:37:19 manu Exp $    */
+/*     $NetBSD: isakmp_unity.c,v 1.10 2012/01/01 17:31:42 tteras Exp $ */
 
 /* Id: isakmp_unity.c,v 1.10 2006/07/31 04:49:23 manubsd Exp */
 
@@ -387,8 +387,9 @@
                netentry = netentry->next;
        }
 
-       /* allocate network list string */
-       str = racoon_malloc(len);
+       /* allocate network list string; we need the extra byte temporarily
+        * as sprintf() will write trailing 0-byte after the space. */
+       str = racoon_malloc(len + 1);
        if (str == NULL)
                return NULL;
 
@@ -414,6 +415,7 @@
                netentry = netentry->next;
        }
 
+       /* trim the string to not have trailing spaces */
        str[len-1]=0;
 
        return str;