summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2010-03-24 17:02:20 +0100
committerMarc-André Lureau <marcandre.lureau@gmail.com>2012-03-20 15:25:40 +0100
commit998bf873bf25fc8e8a326b03fdda11e79ed8b83c (patch)
treeb2040554ea1a497ce13242b0f1fe94664354de29 /common
parenta12f3fe2421f121656f7a142873c278ee72be10c (diff)
downloadspice-common-998bf873bf25fc8e8a326b03fdda11e79ed8b83c.tar.gz
spice-common-998bf873bf25fc8e8a326b03fdda11e79ed8b83c.tar.xz
spice-common-998bf873bf25fc8e8a326b03fdda11e79ed8b83c.zip
Add spice_strndup
Also, make str(n)dup handle NULL correctly
Diffstat (limited to 'common')
-rw-r--r--common/mem.c18
-rw-r--r--common/mem.h1
2 files changed, 19 insertions, 0 deletions
diff --git a/common/mem.c b/common/mem.c
index ad0cccf..56b3715 100644
--- a/common/mem.c
+++ b/common/mem.c
@@ -32,11 +32,29 @@ char *spice_strdup(const char *str)
{
char *copy;
+ if (str == NULL) {
+ return NULL;
+ }
+
copy = (char *)spice_malloc(strlen(str) + 1);
strcpy(copy, str);
return copy;
}
+char *spice_strndup(const char *str, size_t n_bytes)
+{
+ char *copy;
+
+ if (str == NULL) {
+ return NULL;
+ }
+
+ copy = (char *)spice_malloc(n_bytes + 1);
+ strncpy(copy, str, n_bytes);
+ copy[n_bytes] = 0;
+ return copy;
+}
+
void *spice_memdup(const void *mem, size_t n_bytes)
{
void *copy;
diff --git a/common/mem.h b/common/mem.h
index f5fab20..350e421 100644
--- a/common/mem.h
+++ b/common/mem.h
@@ -23,6 +23,7 @@
#include <spice/macros.h>
char *spice_strdup(const char *str) SPICE_GNUC_MALLOC;
+char *spice_strndup(const char *str, size_t n_bytes) SPICE_GNUC_MALLOC;
void *spice_memdup(const void *mem, size_t n_bytes) SPICE_GNUC_MALLOC;
void *spice_malloc(size_t n_bytes) SPICE_GNUC_MALLOC SPICE_GNUC_ALLOC_SIZE(1);
void *spice_malloc0(size_t n_bytes) SPICE_GNUC_MALLOC SPICE_GNUC_ALLOC_SIZE(1);