From c868c586945ad55c519ba9c83f664aa26563ff0c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 27 May 2003 21:30:08 +0000 Subject: [PATCH] Use memcpy instead of strcpy. (#106988, Christian Biere) 2003-05-27 Matthias Clasen * glib/gstrfuncs.c (g_strdup): Use memcpy instead of strcpy. (#106988, Christian Biere) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gstrfuncs.c | 6 ++++-- 7 files changed, 34 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c8c8e166..980ee9789 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-05-27 Matthias Clasen + + * glib/gstrfuncs.c (g_strdup): Use memcpy instead of + strcpy. (#106988, Christian Biere) + 2003-05-23 Noah Levitt * glib/gutf8.c: Fix typo in UNICODE_VALID (related to #107427). diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1c8c8e166..980ee9789 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2003-05-27 Matthias Clasen + + * glib/gstrfuncs.c (g_strdup): Use memcpy instead of + strcpy. (#106988, Christian Biere) + 2003-05-23 Noah Levitt * glib/gutf8.c: Fix typo in UNICODE_VALID (related to #107427). diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 1c8c8e166..980ee9789 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2003-05-27 Matthias Clasen + + * glib/gstrfuncs.c (g_strdup): Use memcpy instead of + strcpy. (#106988, Christian Biere) + 2003-05-23 Noah Levitt * glib/gutf8.c: Fix typo in UNICODE_VALID (related to #107427). diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1c8c8e166..980ee9789 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2003-05-27 Matthias Clasen + + * glib/gstrfuncs.c (g_strdup): Use memcpy instead of + strcpy. (#106988, Christian Biere) + 2003-05-23 Noah Levitt * glib/gutf8.c: Fix typo in UNICODE_VALID (related to #107427). diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1c8c8e166..980ee9789 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2003-05-27 Matthias Clasen + + * glib/gstrfuncs.c (g_strdup): Use memcpy instead of + strcpy. (#106988, Christian Biere) + 2003-05-23 Noah Levitt * glib/gutf8.c: Fix typo in UNICODE_VALID (related to #107427). diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1c8c8e166..980ee9789 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2003-05-27 Matthias Clasen + + * glib/gstrfuncs.c (g_strdup): Use memcpy instead of + strcpy. (#106988, Christian Biere) + 2003-05-23 Noah Levitt * glib/gutf8.c: Fix typo in UNICODE_VALID (related to #107427). diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c index e6fd0fe3a..92a612732 100644 --- a/glib/gstrfuncs.c +++ b/glib/gstrfuncs.c @@ -83,11 +83,13 @@ gchar* g_strdup (const gchar *str) { gchar *new_str; + gsize length; if (str) { - new_str = g_new (char, strlen (str) + 1); - strcpy (new_str, str); + length = strlen (str) + 1; + new_str = g_new (char, length); + memcpy (new_str, str, length); } else new_str = NULL;