Fri Oct 7 16:01:50 2016 UTC ()

CID 1373520: Fix memory leak, don't allocate needlessly.
CID 1373521: Fix memory leak.


(christos)

diff -r1.1.1.1 -r1.2 xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c

--- xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c 2016/08/10 07:44:34	1.1.1.1
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c 2016/10/07 16:01:50	1.2

 @@ -742,28 +742,28 @@ ms_get_drm_master_fd(ScrnInfoPtr pScrn)
 #endif
+        {
             char *path =
                 xf86_platform_device_odev_attributes(pEnt->location.id.plat)->
                 path;
             ms->fd = open_hw(path);
+        }
+    }
     else
 #endif
     if (pEnt->location.type == BUS_PCI) {
         ms->PciInfo = xf86GetPciInfoForEntity(ms->pEnt->index);
         if (ms->PciInfo) {
-            BusID = malloc(64);
+            char BusID[256];
-            sprintf(BusID, "PCI:%d:%d:%d",
+            snprintf(BusID, sizeof(BusID), "PCI:%d:%d:%d",
 #if XSERVER_LIBPCIACCESS
                     ((ms->PciInfo->domain << 8) | ms->PciInfo->bus),
                     ms->PciInfo->dev, ms->PciInfo->func
 #else
                     ((pciConfigPtr) ms->PciInfo->thisCard)->busnum,
                     ((pciConfigPtr) ms->PciInfo->thisCard)->devnum,
                     ((pciConfigPtr) ms->PciInfo->thisCard)->funcnum
 #endif
                 );
+        }
         ms->fd = drmOpen(NULL, BusID);
+    }
     else {
 @@ -786,32 +786,35 @@ PreInit(ScrnInfoPtr pScrn, int flags)
     rgb defaultWeight = { 0, 0, 0 };
     EntityInfoPtr pEnt;
     uint64_t value = 0;
     int ret;
     int bppflags;
     int defaultdepth, defaultbpp;
     if (pScrn->numEntities != 1)
         return FALSE;
     pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
     if (flags & PROBE_DETECT) {
 	free(pEnt);
         return FALSE;
+    }
     /* Allocate driverPrivate */
-    if (!GetRec(pScrn))
+    if (!GetRec(pScrn)) {
 	free(pEnt);
         return FALSE;
+    }
     ms = modesettingPTR(pScrn);
     ms->SaveGeneration = -1;
     ms->pEnt = pEnt;
     ms->drmmode.is_secondary = FALSE;
     pScrn->displayWidth = 640;  /* default it */
     if (xf86IsEntityShared(pScrn->entityList[0])) {
         if (xf86IsPrimInitDone(pScrn->entityList[0]))
             ms->drmmode.is_secondary = TRUE;
         else
             xf86SetPrimInitDone(pScrn->entityList[0]);
+    }