XLibre/xf86-video-amdgpu
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-amdgpu.git synced 2026-03-24 01:24:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't crash server on malloc fail (XNFasprintf)

Browse Source 
Use standard libc asprintf() instead of XNFasprintf().

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-11-06 16:48:16 +01:00
committed by Enrico Weigelt
parent 04d2e00121
commit 7581891ec8
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/amdgpu_probe.c
View File

@@ -123,8 +123,11 @@ static int amdgpu_kernel_open_fd(ScrnInfoPtr pScrn,
else
dev = pci_dev;
XNFasprintf(&pAMDGPUEnt->busid, "pci:%04x:%02x:%02x.%u",
dev->domain, dev->bus, dev->dev, dev->func);
if (asprintf(&pAMDGPUEnt->busid, "pci:%04x:%02x:%02x.%u",
dev->domain, dev->bus, dev->dev, dev->func) == -1) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "[drm] malloc failed\n");
return -1;
}
if (platform_dev) {
fd = xf86_get_platform_device_int_attrib(platform_dev,

6
src/drmmode_display.c
View File

@@ -3283,7 +3283,11 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp)
/* workout clones */
drmmode_clones_init(pScrn, drmmode, mode_res);
XNFasprintf(&provider_name, "%s @ %s", pScrn->chipset, pAMDGPUEnt->busid);
if (asprintf(&provider_name, "%s @ %s", pScrn->chipset, pAMDGPUEnt->busid) == -1) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "malloc failed\n");
return FALSE;
}
xf86ProviderSetup(pScrn, NULL, provider_name);
free(provider_name);