From 5ee2c4c20c634695b0b284fdf528fa115c0c0b21 Mon Sep 17 00:00:00 2001 From: "Ben \"root\" Anderson" Date: Wed, 22 Jan 2014 00:35:44 -0600 Subject: [PATCH] Fix a (probably very very rare) memory leak --- src/arch/ArchHooks/ArchHooks_Unix.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/arch/ArchHooks/ArchHooks_Unix.cpp b/src/arch/ArchHooks/ArchHooks_Unix.cpp index 57869f838e..5bbef72484 100644 --- a/src/arch/ArchHooks/ArchHooks_Unix.cpp +++ b/src/arch/ArchHooks/ArchHooks_Unix.cpp @@ -340,9 +340,15 @@ RString ArchHooks_Unix::GetClipboard() int unused2; // XXX: "actual format of the property"? What? unsigned long unused3; ck = XGetWindowProperty( Dpy, Win, XA_PRIMARY, 0, LONG_MAX, true, XA_STRING, &pstType, &unused2, &unused3, &remainder, &paste ); - if( ck != Success || pstType != XA_STRING ) - // Selection doesn't exist or isn't stringable + if( ck != Success ) + // Selection doesn't exist return ""; + if( pstType != XA_STRING ) + { + // Selection isn't stringable + XFree(paste); + return ""; + } ret = RString( (char*) paste); XFree(paste);