fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-02-05 08:50:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dbus-launch: avoid asprintf(), and die gracefully on out-of-memory

Browse source 
asprintf() is a GNU extension (non-portable).

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37849
Reviewed-by: Chengwei Yang <chengwei.yang@intel.com>
This commit is contained in:
Simon McVittie 2013-09-16 13:40:22 +01:00
parent fd5271f839
commit 580ed1c8fb
1 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
tools/dbus-launch.c
View file

@ -222,6 +222,26 @@ xstrdup (const char *str)
return copy;
}
static char *
concat2 (const char *a,
const char *b)
{
size_t la, lb;
char *ret;
la = strlen (a);
lb = strlen (b);
ret = malloc (la + lb + 1);
if (ret == NULL)
return NULL;
memcpy (ret, a, la);
memcpy (ret + la, b, lb + 1);
return ret;
}
typedef enum
{
READ_STATUS_OK, /**< Read succeeded */
@ -1114,11 +1134,15 @@ main (int argc, char **argv)
{
if (config_file == NULL && getenv ("DBUS_TEST_DATA") != NULL)
{
ret = asprintf (&config_file, "%s/valid-config-files/session.conf",
getenv ("DBUS_TEST_DATA"));
config_file = concat2 (getenv ("DBUS_TEST_DATA"),
"/valid-config-files/session.conf");
if (config_file == NULL)
{
fprintf (stderr, "Out of memory\n");
exit (1);
}
}
if (ret == -1 && config_file != NULL)
free (config_file);
execl (TEST_BUS_BINARY,
TEST_BUS_BINARY,