Fix some misuses of strncat().

diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c
index e84cd7a1307bb8ca3b2b88d5fe25afb92688a48a..edd4a6af368ac4d743fd00dd9abc82dccc6d5e52 100644 (file)
--- a/src/bin/pg_config/pg_config.c
+++ b/src/bin/pg_config/pg_config.c
@@ -17,7 +17,7 @@
  *
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.20 2006/06/06 22:41:09 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.21 2006/09/27 16:19:42 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -213,7 +213,7 @@ show_pgxs(bool all)
        if (all)
                printf("PGXS = ");
        get_pkglib_path(mypath, path);
-       strncat(path, "/pgxs/src/makefiles/pgxs.mk", MAXPGPATH - 1);
+       strncat(path, "/pgxs/src/makefiles/pgxs.mk", MAXPGPATH - 1 - strlen(path));
        cleanup_path(path);
        printf("%s\n", path);
 }

diff --git a/src/tutorial/funcs.c b/src/tutorial/funcs.c
index 2ac798f81b699ef9e6cc28e5fd9b516587a2bd4e..18f8467dddb61812ae80a8c88649af81c6e181bd 100644 (file)
--- a/src/tutorial/funcs.c
+++ b/src/tutorial/funcs.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/tutorial/funcs.c,v 1.15 2006/05/31 20:58:09 tgl Exp $ */
+/* $PostgreSQL: pgsql/src/tutorial/funcs.c,v 1.16 2006/09/27 16:19:42 tgl Exp $ */
 
 /******************************************************************************
   These are user-defined functions that can be bound to a Postgres backend
@@ -85,13 +85,14 @@ copytext(text *t)
 text *
 concat_text(text *arg1, text *arg2)
 {
-       int32           new_text_size = VARSIZE(arg1) + VARSIZE(arg2) - VARHDRSZ;
+       int32           arg1_size = VARSIZE(arg1) - VARHDRSZ;
+       int32           arg2_size = VARSIZE(arg2) - VARHDRSZ;
+       int32           new_text_size = arg1_size + arg2_size + VARHDRSZ;
        text       *new_text = (text *) palloc(new_text_size);
 
-       memset((void *) new_text, 0, new_text_size);
        VARATT_SIZEP(new_text) = new_text_size;
-       strncpy(VARDATA(new_text), VARDATA(arg1), VARSIZE(arg1) - VARHDRSZ);
-       strncat(VARDATA(new_text), VARDATA(arg2), VARSIZE(arg2) - VARHDRSZ);
+       memcpy(VARDATA(new_text), VARDATA(arg1), arg1_size);
+       memcpy(VARDATA(new_text) + arg1_size, VARDATA(arg2), arg2_size);
        return new_text;
 }
 

diff --git a/src/tutorial/funcs_new.c b/src/tutorial/funcs_new.c
index b42f495d0194767244e59f588da7dfbfccf306cd..88fff266c4ebc1e5c488388c2df21a75367de073 100644 (file)
--- a/src/tutorial/funcs_new.c
+++ b/src/tutorial/funcs_new.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/tutorial/funcs_new.c,v 1.11 2006/07/14 14:52:27 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/tutorial/funcs_new.c,v 1.12 2006/09/27 16:19:42 tgl Exp $ */
 
 /******************************************************************************
   These are user-defined functions that can be bound to a Postgres backend
@@ -101,13 +101,14 @@ concat_text(PG_FUNCTION_ARGS)
 {
        text       *arg1 = PG_GETARG_TEXT_P(0);
        text       *arg2 = PG_GETARG_TEXT_P(1);
-       int32           new_text_size = VARSIZE(arg1) + VARSIZE(arg2) - VARHDRSZ;
+       int32           arg1_size = VARSIZE(arg1) - VARHDRSZ;
+       int32           arg2_size = VARSIZE(arg2) - VARHDRSZ;
+       int32           new_text_size = arg1_size + arg2_size + VARHDRSZ;
        text       *new_text = (text *) palloc(new_text_size);
 
-       memset((void *) new_text, 0, new_text_size);
        VARATT_SIZEP(new_text) = new_text_size;
-       strncpy(VARDATA(new_text), VARDATA(arg1), VARSIZE(arg1) - VARHDRSZ);
-       strncat(VARDATA(new_text), VARDATA(arg2), VARSIZE(arg2) - VARHDRSZ);
+       memcpy(VARDATA(new_text), VARDATA(arg1), arg1_size);
+       memcpy(VARDATA(new_text) + arg1_size, VARDATA(arg2), arg2_size);
        PG_RETURN_TEXT_P(new_text);
 }