Nyaaori/gamescope
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

drm: Add some nullptr checks for drm->connector

Browse source
This commit is contained in:
Joshua Ashton 2022-11-20 20:26:58 +00:00
parent ed48ef3b05
commit b5b1589d45
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/drm.cpp
View file

@ -1274,7 +1274,7 @@ static void update_drm_effective_orientation(struct drm_t *drm, struct connector
g_drmEffectiveOrientation = DRM_MODE_ROTATE_270; g_drmEffectiveOrientation = DRM_MODE_ROTATE_270;
break; break;
case PANEL_ORIENTATION_AUTO: case PANEL_ORIENTATION_AUTO:
if (conn->props.count("panel orientation") > 0 ) if (conn && conn->props.count("panel orientation") > 0)
{ {
const char *orientation = get_enum_name(conn->props["panel orientation"], conn->initial_prop_values["panel orientation"]); const char *orientation = get_enum_name(conn->props["panel orientation"], conn->initial_prop_values["panel orientation"]);
@ -2270,6 +2270,9 @@ bool drm_update_degamma_lut(struct drm_t *drm)
bool drm_set_mode( struct drm_t *drm, const drmModeModeInfo *mode ) bool drm_set_mode( struct drm_t *drm, const drmModeModeInfo *mode )
{ {
if (!drm->connector || !drm->connector->connector)
return false;
uint32_t mode_id = 0; uint32_t mode_id = 0;
if (drmModeCreatePropertyBlob(drm->fd, mode, sizeof(*mode), &mode_id) != 0) if (drmModeCreatePropertyBlob(drm->fd, mode, sizeof(*mode), &mode_id) != 0)
return false; return false;
@ -2312,6 +2315,9 @@ bool drm_set_refresh( struct drm_t *drm, int refresh )
height = tmp; height = tmp;
} }
if (!drm->connector || !drm->connector->connector)
return false;
drmModeConnector *connector = drm->connector->connector; drmModeConnector *connector = drm->connector->connector;
const drmModeModeInfo *existing_mode = find_mode(connector, width, height, refresh); const drmModeModeInfo *existing_mode = find_mode(connector, width, height, refresh);
drmModeModeInfo mode = {0}; drmModeModeInfo mode = {0};
@ -2351,6 +2357,9 @@ bool drm_set_refresh( struct drm_t *drm, int refresh )
bool drm_set_resolution( struct drm_t *drm, int width, int height ) bool drm_set_resolution( struct drm_t *drm, int width, int height )
{ {
if (!drm->connector || !drm->connector->connector)
return false;
drmModeConnector *connector = drm->connector->connector; drmModeConnector *connector = drm->connector->connector;
const drmModeModeInfo *mode = find_mode(connector, width, height, 0); const drmModeModeInfo *mode = find_mode(connector, width, height, 0);
if ( !mode ) if ( !mode )