[PATCH libdrm] tests/exynos: fix memory issues of error path in g2d test

[Seung-Woo Kim]

This patch fixes memory issues including NULL deference and leak
in g2d test in error path.

Signed-off-by: Seung-Woo Kim <sw0312....@samsung.com>
---
 tests/exynos/exynos_fimg2d_test.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tests/exynos/exynos_fimg2d_test.c 
b/tests/exynos/exynos_fimg2d_test.c
index 797fb6e..2177e08 100644
--- a/tests/exynos/exynos_fimg2d_test.c
+++ b/tests/exynos/exynos_fimg2d_test.c
@@ -59,7 +59,6 @@ static void connector_find_mode(int fd, struct connector *c,
                if (!connector) {
                        fprintf(stderr, "could not get connector %i: %s\n",
                                resources->connectors[i], strerror(errno));
-                       drmModeFreeConnector(connector);
                        continue;
                }
 
@@ -98,7 +97,6 @@ static void connector_find_mode(int fd, struct connector *c,
                if (!c->encoder) {
                        fprintf(stderr, "could not get encoder %i: %s\n",
                                resources->encoders[i], strerror(errno));
-                       drmModeFreeEncoder(c->encoder);
                        continue;
                }
 
@@ -264,7 +262,8 @@ static int g2d_copy_test(struct exynos_device *dev, struct 
exynos_bo *src,
                userptr = (unsigned long)malloc(size);
                if (!userptr) {
                        fprintf(stderr, "failed to allocate userptr.\n");
-                       return -EFAULT;
+                       ret = -EFAULT;
+                       goto fail;
                }
 
                src_img.user_ptr[0].userptr = userptr;
@@ -469,7 +468,8 @@ static int g2d_copy_with_scale_test(struct exynos_device 
*dev,
                userptr = (unsigned long)malloc(size);
                if (!userptr) {
                        fprintf(stderr, "failed to allocate userptr.\n");
-                       return -EFAULT;
+                       ret = -EFAULT;
+                       goto fail;
                }
 
                src_img.user_ptr[0].userptr = userptr;
@@ -557,7 +557,8 @@ static int g2d_blend_test(struct exynos_device *dev,
                userptr = (unsigned long)malloc(size);
                if (!userptr) {
                        fprintf(stderr, "failed to allocate userptr.\n");
-                       return -EFAULT;
+                       ret = -EFAULT;
+                       goto fail;
                }
 
                src_img.user_ptr[0].userptr = userptr;
@@ -755,7 +756,7 @@ int main(int argc, char **argv)
 
        dev = exynos_device_create(fd);
        if (!dev) {
-               drmClose(dev->fd);
+               drmClose(fd);
                return -EFAULT;
        }
 
-- 
1.7.4.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel