[src/trunk]: src/usr.bin/xlint/lint1 PR/44148: Henning Petersen: catstrg() do...

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

details:   https://anonhg.NetBSD.org/src/rev/b9d3440d203f
branches:  trunk
changeset: 759020:b9d3440d203f
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Nov 24 17:51:11 2010 +0000

description:
PR/44148: Henning Petersen: catstrg() does not set the resulting string length.

diffstat:

 usr.bin/xlint/lint1/tree.c |  18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diffs (46 lines):

diff -r 6641f6888af4 -r b9d3440d203f usr.bin/xlint/lint1/tree.c
--- a/usr.bin/xlint/lint1/tree.c        Wed Nov 24 17:40:41 2010 +0000
+++ b/usr.bin/xlint/lint1/tree.c        Wed Nov 24 17:51:11 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tree.c,v 1.64 2010/03/21 14:29:04 christos Exp $       */
+/*     $NetBSD: tree.c,v 1.65 2010/11/24 17:51:11 christos Exp $       */
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tree.c,v 1.64 2010/03/21 14:29:04 christos Exp $");
+__RCSID("$NetBSD: tree.c,v 1.65 2010/11/24 17:51:11 christos Exp $");
 #endif
 
 #include <stdlib.h>
@@ -4007,19 +4007,21 @@
                return (strg1);
        }
 
-       len = (len1 = strg1->st_len) + (len2 = strg2->st_len);
+       len1 = strg1->st_len;
+       len2 = strg2->st_len + 1;       /* + NUL */
+       len = len1 + len2;
 
        if (strg1->st_tspec == CHAR) {
-               strg1->st_cp = xrealloc(strg1->st_cp, len + 1);
-               (void)memcpy(strg1->st_cp + len1, strg2->st_cp, len2 + 1);
+               strg1->st_cp = xrealloc(strg1->st_cp, len);
+               (void)memcpy(strg1->st_cp + len1, strg2->st_cp, len2);
                free(strg2->st_cp);
        } else {
-               strg1->st_wcp = xrealloc(strg1->st_wcp,
-                                        (len + 1) * sizeof (wchar_t));
+               strg1->st_wcp = xrealloc(strg1->st_wcp, sizeof(*strg1->st_wcp));
                (void)memcpy(strg1->st_wcp + len1, strg2->st_wcp,
-                            (len2 + 1) * sizeof (wchar_t));
+                   len2 * sizeof(*strg1->st_wcp));
                free(strg2->st_wcp);
        }
+       strg1->st_len = len - 1; /* - NUL */;
        free(strg2);
 
        return (strg1);