Mesa (master): pipe-loader: Fix memory leak v2

Tom Stellard tstellar at kemper.freedesktop.org
Thu Aug 21 14:07:22 UTC 2014


Module: Mesa
Branch: master
Commit: 43d954342e02a2bd719e543d567fd6c43b3e5367
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=43d954342e02a2bd719e543d567fd6c43b3e5367

Author: Tom Stellard <thomas.stellard at amd.com>
Date:   Tue Aug 19 14:04:32 2014 -0700

pipe-loader: Fix memory leak v2

v2:
  - Change driver_name to char*

Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
CC: "10.2" <mesa-stable at lists.freedesktop.org>

---

 src/gallium/auxiliary/pipe-loader/pipe_loader.h     |    2 +-
 src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader.h b/src/gallium/auxiliary/pipe-loader/pipe_loader.h
index 8ff00b1..6127a6a 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader.h
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.h
@@ -67,7 +67,7 @@ struct pipe_loader_device {
       } pci;
    } u; /**< Discriminated by \a type */
 
-   const char *driver_name;
+   char *driver_name;
    const struct pipe_loader_ops *ops;
 };
 
diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
index 1bbaf19..88056f5 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
@@ -256,7 +256,7 @@ pipe_loader_drm_release(struct pipe_loader_device **dev)
       util_dl_close(ddev->lib);
 
    close(ddev->fd);
-   /* XXX: Free ddev->base.driver_name - strdup at loader_get_driver_for_fd */
+   FREE(ddev->base.driver_name);
    FREE(ddev);
    *dev = NULL;
 }




More information about the mesa-commit mailing list