summaryrefslogtreecommitdiff
diff options
authorDaniel van Vugt <daniel.van.vugt@canonical.com>2025-03-27 17:41:37 +0800
committerDaniel van Vugt <daniel.van.vugt@canonical.com>2025-03-27 17:43:05 +0800
commitd387ec976f1f86faa1fea5455ac86e84b55ce53f (patch)
tree7e479f58e68a445fc62cca093e023c9ef8b18e1f
parenta7eb2cfd53a70fcd9ba9dcfad80a3994642f362f (diff)
xf86drm: Handle NULL in drmCopyVersion
Just as it is already handled in the caller, `drmGetVersion`. I'm not sure what the offending driver is, but the Ubuntu incidents seem to be coming from a dual Intel/Nvidia machine. And they show it is `card1` so I'm guessing `nvidia-drm` is the offender. Related: https://bugs.launchpad.net/bugs/2104352
-rw-r--r--xf86drm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xf86drm.c b/xf86drm.c
index 22214417..06fdb85f 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -1348,11 +1348,11 @@ static void drmCopyVersion(drmVersionPtr d, const drm_version_t *s)
d->version_minor = s->version_minor;
d->version_patchlevel = s->version_patchlevel;
d->name_len = s->name_len;
- d->name = strdup(s->name);
+ d->name = s->name ? strdup(s->name) : NULL;
d->date_len = s->date_len;
- d->date = strdup(s->date);
+ d->date = s->date ? strdup(s->date) : NULL;
d->desc_len = s->desc_len;
- d->desc = strdup(s->desc);
+ d->desc = s->desc ? strdup(s->desc) : NULL;
}
close