luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-02 05:43:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Cleanups after we dropped mem vtables"

Browse Source 
This reverts commit 627854fee1fde93e01f27655b00a9082348ee15f.

It has been argued that not aborting on malloc() failure is
an incompatible change.
This commit is contained in:
Matthias Clasen 2015-09-12 12:05:31 -04:00
parent 9acd0ddbf3
commit b9a27679ec
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
glib/gstrfuncs.c
View File

@ -354,10 +354,19 @@ get_C_locale (void)
gchar* gchar*
g_strdup (const gchar *str) g_strdup (const gchar *str)
{ {
gchar *new_str;
gsize length;
if (str) if (str)
return strdup (str); {
length = strlen (str) + 1;
new_str = g_new (char, length);
memcpy (new_str, str, length);
}
else else
return NULL; new_str = NULL;
return new_str;
} }
/** /**
@ -409,10 +418,18 @@ gchar*
g_strndup (const gchar *str, g_strndup (const gchar *str,
gsize n) gsize n)
{ {
gchar *new_str;
if (str) if (str)
return strndup (str, n); {
new_str = g_new (gchar, n + 1);
strncpy (new_str, str, n);
new_str[n] = '\0';
}
else else
return NULL; new_str = NULL;
return new_str;
} }
/** /**