Mesa (master): st/xorg: add sanity checks after malloc
Emil Velikov
evelikov at kemper.freedesktop.org
Tue Oct 29 21:51:30 UTC 2013
Module: Mesa
Branch: master
Commit: 2b7ffde8bd0d11258d0e71e01ec226022d51059a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2b7ffde8bd0d11258d0e71e01ec226022d51059a
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sat Sep 21 17:53:43 2013 +0100
st/xorg: add sanity checks after malloc
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
---
src/gallium/state_trackers/xorg/xorg_driver.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/gallium/state_trackers/xorg/xorg_driver.c b/src/gallium/state_trackers/xorg/xorg_driver.c
index dd243bc..097c354 100644
--- a/src/gallium/state_trackers/xorg/xorg_driver.c
+++ b/src/gallium/state_trackers/xorg/xorg_driver.c
@@ -124,6 +124,9 @@ Bool
xorg_tracker_have_modesetting(ScrnInfoPtr pScrn, struct pci_device *device)
{
char *BusID = malloc(64);
+
+ if (!BusID)
+ return FALSE;
sprintf(BusID, "pci:%04x:%02x:%02x.%d",
device->domain, device->bus,
device->dev, device->func);
@@ -276,6 +279,9 @@ drv_init_drm(ScrnInfoPtr pScrn)
char *BusID;
BusID = malloc(64);
+ if (!BusID)
+ return FALSE;
+
sprintf(BusID, "PCI:%d:%d:%d",
((ms->PciInfo->domain << 8) | ms->PciInfo->bus),
ms->PciInfo->dev, ms->PciInfo->func
More information about the mesa-commit
mailing list