diff options
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/fmgr/dfmgr.c | 5 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c index fdbcc69cdec..f660c19e29b 100644 --- a/src/backend/utils/fmgr/dfmgr.c +++ b/src/backend/utils/fmgr/dfmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.93 2007/01/05 22:19:43 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.94 2007/02/07 00:52:35 petere Exp $ * *------------------------------------------------------------------------- */ @@ -539,8 +539,7 @@ find_in_dynamic_libpath(const char *basename) len = piece - p; piece = palloc(len + 1); - strncpy(piece, p, len); - piece[len] = '\0'; + strlcpy(piece, p, len + 1); mangled = substitute_libpath_macro(piece); pfree(piece); diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 1c8a4893d95..f7e6536f93d 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut <peter_e@gmx.net>. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.372 2007/02/01 19:10:28 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.373 2007/02/07 00:52:35 petere Exp $ * *-------------------------------------------------------------------- */ @@ -5729,8 +5729,7 @@ ParseLongOption(const char *string, char **name, char **value) if (string[equal_pos] == '=') { *name = guc_malloc(FATAL, equal_pos + 1); - strncpy(*name, string, equal_pos); - (*name)[equal_pos] = '\0'; + strlcpy(*name, string, equal_pos + 1); *value = guc_strdup(FATAL, &string[equal_pos + 1]); } |