X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Floader%2Floader.c;h=92b4c5204b1995ca577d99ac7ce13e3f4a4e0496;hb=7075c084fc5699d76970d2f045c8c7c668dc53d8;hp=913b3dcac032b3c9cd0ab068874627913f2b45bc;hpb=1b313eedb5e5da3c7ee3f62a83b66a6e097fe0d3;p=mesa.git diff --git a/src/loader/loader.c b/src/loader/loader.c index 913b3dcac03..92b4c5204b1 100644 --- a/src/loader/loader.c +++ b/src/loader/loader.c @@ -110,17 +110,16 @@ static char *loader_get_dri_config_device_id(void) static char *drm_construct_id_path_tag(drmDevicePtr device) { -#define PCI_ID_PATH_TAG_LENGTH sizeof("pci-xxxx_xx_xx_x") char *tag = NULL; if (device->bustype == DRM_BUS_PCI) { - tag = calloc(PCI_ID_PATH_TAG_LENGTH, sizeof(char)); - if (tag == NULL) - return NULL; - - snprintf(tag, PCI_ID_PATH_TAG_LENGTH, "pci-%04x_%02x_%02x_%1u", - device->businfo.pci->domain, device->businfo.pci->bus, - device->businfo.pci->dev, device->businfo.pci->func); + if (asprintf(&tag, "pci-%04x_%02x_%02x_%1u", + device->businfo.pci->domain, + device->businfo.pci->bus, + device->businfo.pci->dev, + device->businfo.pci->func) < 0) { + return NULL; + } } return tag; }