encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle NULL return from SDL_DBus_GetContext()

This commit is contained in:
Sam Lantinga 2018-04-23 20:24:12 -07:00
parent b5d231eede
commit a9ae1b508d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/power/linux/SDL_syspower.c
View File

@ -608,12 +608,12 @@ SDL_GetPowerInfo_Linux_org_freedesktop_upower(SDL_PowerState *state, int *second
{ {
SDL_bool retval = SDL_FALSE; SDL_bool retval = SDL_FALSE;
#if SDL_USE_LIBDBUS #if SDL_USE_LIBDBUS
SDL_DBusContext *dbus = SDL_DBus_GetContext(); SDL_DBusContext *dbus = SDL_DBus_GetContext();
char **paths = NULL; char **paths = NULL;
int i, numpaths = 0; int i, numpaths = 0;
if (!SDL_DBus_CallMethodOnConnection(dbus->system_conn, UPOWER_DBUS_NODE, UPOWER_DBUS_PATH, UPOWER_DBUS_INTERFACE, "EnumerateDevices", if (!dbus || !SDL_DBus_CallMethodOnConnection(dbus->system_conn, UPOWER_DBUS_NODE, UPOWER_DBUS_PATH, UPOWER_DBUS_INTERFACE, "EnumerateDevices",
DBUS_TYPE_INVALID, DBUS_TYPE_INVALID,
DBUS_TYPE_ARRAY, DBUS_TYPE_OBJECT_PATH, &paths, &numpaths, DBUS_TYPE_INVALID)) { DBUS_TYPE_ARRAY, DBUS_TYPE_OBJECT_PATH, &paths, &numpaths, DBUS_TYPE_INVALID)) {
return SDL_FALSE; /* try a different approach than UPower. */ return SDL_FALSE; /* try a different approach than UPower. */
@ -631,7 +631,7 @@ SDL_GetPowerInfo_Linux_org_freedesktop_upower(SDL_PowerState *state, int *second
if (dbus) { if (dbus) {
dbus->free_string_array(paths); dbus->free_string_array(paths);
} }
#endif /* SDL_USE_LIBDBUS */ #endif /* SDL_USE_LIBDBUS */
return retval; return retval;
} }