[PATCH libX11 1/2] Fix potential memory leak

Peter Hutterer peter.hutterer at who-t.net
Sun May 17 15:54:43 PDT 2015


If we hit the depth limit, filename leaks. Move the depth check up before we
allocate filename.
Introduced in 226622349a4b1e16064649d4444a34fb4be4f464.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 modules/im/ximcp/imLcPrs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/im/ximcp/imLcPrs.c b/modules/im/ximcp/imLcPrs.c
index 9bb45ff..4979975 100644
--- a/modules/im/ximcp/imLcPrs.c
+++ b/modules/im/ximcp/imLcPrs.c
@@ -496,10 +496,10 @@ parseline(
             token = nexttoken(fp, tokenbuf, &lastch);
             if (token != KEY && token != STRING)
                 goto error;
-            if ((filename = TransFileName(im, tokenbuf)) == NULL)
-                goto error;
             if (++depth > 100)
                 goto error;
+            if ((filename = TransFileName(im, tokenbuf)) == NULL)
+                goto error;
             infp = _XFopenFile(filename, "r");
                 Xfree(filename);
             if (infp == NULL)
-- 
2.3.5



More information about the xorg-devel mailing list