[PATCH xf86-video-ati 4/4] Always call drmModeFreeProperty after drmModeGetProperty

Michel Dänzer michel at daenzer.net
Fri Oct 20 15:28:20 UTC 2017


From: Michel Dänzer <michel.daenzer at amd.com>

We were not doing so in all cases, leaking memory allocated by the
latter.

(Cherry picked from amdgpu commit f6b39bcd45cb06976ba8a3600df77fc471c63995)

Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
---
 src/drmmode_display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 369c1efc3..167ecfb43 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1913,8 +1913,8 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, drmModeResPtr mode_r
 				drmModeFreeProperty(props);
 				break;
 			}
-			drmModeFreeProperty(props);
 		}
+		drmModeFreeProperty(props);
 	}
 
 	kencoders = calloc(sizeof(drmModeEncoderPtr), koutput->count_encoders);
@@ -2003,8 +2003,8 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, drmModeResPtr mode_r
 				drmModeFreeProperty(props);
 				break;
 			}
-			drmModeFreeProperty(props);
 		}
+		drmModeFreeProperty(props);
 	}
 
 	if (dynamic) {
-- 
2.14.2



More information about the amd-gfx mailing list