From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Alex Newsgroups: gmane.emacs.bugs Subject: bug#35179: [PATCH] Plug memory leak in GTK x-display-monitor-attributes-list Date: Sat, 06 Apr 2019 23:16:53 -0600 Message-ID: <87a7h2z96i.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="14195"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) To: 35179@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Apr 07 07:18:21 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hD0CC-0003Z5-Re for geb-bug-gnu-emacs@m.gmane.org; Sun, 07 Apr 2019 07:18:21 +0200 Original-Received: from localhost ([127.0.0.1]:34581 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hD0CB-0002by-Mx for geb-bug-gnu-emacs@m.gmane.org; Sun, 07 Apr 2019 01:18:19 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:39779) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hD0Bv-0002Wl-BU for bug-gnu-emacs@gnu.org; Sun, 07 Apr 2019 01:18:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hD0Bu-0005rg-Ga for bug-gnu-emacs@gnu.org; Sun, 07 Apr 2019 01:18:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:34146) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hD0Bu-0005rX-8D for bug-gnu-emacs@gnu.org; Sun, 07 Apr 2019 01:18:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hD0Bu-0005tB-3L for bug-gnu-emacs@gnu.org; Sun, 07 Apr 2019 01:18:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Alex Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 07 Apr 2019 05:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35179 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.155461422421713 (code B ref -1); Sun, 07 Apr 2019 05:18:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 7 Apr 2019 05:17:04 +0000 Original-Received: from localhost ([127.0.0.1]:47690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hD0Ay-0005dr-Bd for submit@debbugs.gnu.org; Sun, 07 Apr 2019 01:17:04 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:53502) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hD0Aw-0005Y9-KC for submit@debbugs.gnu.org; Sun, 07 Apr 2019 01:17:02 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:54152) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hD0Ar-0005SB-Ag for submit@debbugs.gnu.org; Sun, 07 Apr 2019 01:16:57 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:39650) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hD0Aq-0002Gb-5k for bug-gnu-emacs@gnu.org; Sun, 07 Apr 2019 01:16:57 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hD0Ap-0005Ra-6t for bug-gnu-emacs@gnu.org; Sun, 07 Apr 2019 01:16:56 -0400 Original-Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]:37412) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hD0Ao-0005R9-Nh for bug-gnu-emacs@gnu.org; Sun, 07 Apr 2019 01:16:55 -0400 Original-Received: by mail-pf1-x42f.google.com with SMTP id 8so5654078pfr.4 for ; Sat, 06 Apr 2019 22:16:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:user-agent:mime-version; bh=hF1/Jpr+IrvwaAciwKx6m4PbumO6iDQzX3dmMZCfzmw=; b=Ub8vvCeC+FI7lIJ8K/9j9boN3/V/uMFx40Io1zhAsGhpvnSVk04kpRd+L7fT+gjbA3 VG9LzFTEqpFDx1Xt7c7CGYeMk5NkzLpkiAfeQzDIHOBgFvDlI/T+EqG9F7LgDeAtoq5O s2phTcTx7C6omczD+mXokjnEjaPrIQfVE9wn1iV6ybuWLc2HMXanO22vlTOLQHIy8/Ei mWdBS6+iNq8pKAwAWUxZQ1/tkKwvZD0rdOdLpKxXoyD4dGQ2ruOTCTmFNrX06Zp54ALI A6+M54hOVkkCijTPPnN1CKrly+5JBbcSdccjRXzgnKaegBvK5wWWXh09psjiDZqYmVP2 RpVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:user-agent :mime-version; bh=hF1/Jpr+IrvwaAciwKx6m4PbumO6iDQzX3dmMZCfzmw=; b=mXEL5kDeRNMK1ppP8N4g1RxZYWEyETUZxxwjdhktuBVFtp44klryFB8NQXP1lvkhl0 zEGDgAuUfH6c3d9+8+I13mYHt0MPks7AOHxmndos+BGdU4i8ufUBvdfhkvmQ41M5opeJ z/q70Ci6YZn4Zhp0xjYCZFYt9AU+370ZIc1QB51tnmFr1r0oYppbZM3R659HBrkjwBHD V7KNGwZHMIM/1ZDyunNbSHJd4qi9l7ti084n0ptC/NVaOLR4GpiJimJc6Y8gTkHcbQ9B SnlSPIpKbeVP8zMj0iYRaSX74QvwcdeseSTMbSuKWklVmQKyNLDWFbdemHcy8JtCJPbQ eBOw== X-Gm-Message-State: APjAAAUIGSehS8J9P5wjz6KQH7NYHvllau0YbrhQE/Em/QXFjCy4P3aB unc3gNyo3P/oUSudDbOhW8d6oEb3 X-Google-Smtp-Source: APXvYqyQTdM/lv059RbMJofTPdW8I6SsYIxORiuJqEJKVd1LJXVdyOQ770yf9lsjD6ikqrVFGcZ4ww== X-Received: by 2002:a63:243:: with SMTP id 64mr21152818pgc.214.1554614213445; Sat, 06 Apr 2019 22:16:53 -0700 (PDT) Original-Received: from lylat ([2604:3d09:e37f:1500:1a72:4878:e793:7302]) by smtp.gmail.com with ESMTPSA id n22sm30634306pfa.51.2019.04.06.22.16.52 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 06 Apr 2019 22:16:52 -0700 (PDT) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:157302 Archived-At: --=-=-= Content-Type: text/plain Also declare `name' in MonitorInfo const to satisfy the compiler. Is it too late to push a memory leak fix like this to emacs-26? --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Plug-memory-leak-in-GTK-x-display-monitor-attributes.patch Content-Description: GTK memory leak >From b9c71187840f72f5145da5794e1ca69d4a074654 Mon Sep 17 00:00:00 2001 From: Alexander Gramiak Date: Sat, 6 Apr 2019 23:02:24 -0600 Subject: [PATCH] Plug memory leak in GTK x-display-monitor-attributes-list * src/xfns.c (x-display-monitor-attributes-list): Plug memory leak and don't needlessly duplicate the model name. * src/frame.h (MonitorInfo): Declare name as pointing to const char. --- src/frame.h | 2 +- src/xfns.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/frame.h b/src/frame.h index ed62e7ace0..b1eedf36a3 100644 --- a/src/frame.h +++ b/src/frame.h @@ -1648,7 +1648,7 @@ flush_frame (struct frame *f) struct MonitorInfo { XRectangle geom, work; int mm_width, mm_height; - char *name; + const char *name; }; extern void free_monitors (struct MonitorInfo *monitors, int n_monitors); diff --git a/src/xfns.c b/src/xfns.c index f238a3daa1..396e77c1db 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -5030,7 +5030,7 @@ Internal use only, use `display-monitor-attributes-list' instead. */) mi->mm_height = height_mm; #if GTK_CHECK_VERSION (3, 22, 0) - mi->name = g_strdup (gdk_monitor_get_model (monitor)); + mi->name = gdk_monitor_get_model (monitor); #elif GTK_CHECK_VERSION (2, 14, 0) mi->name = gdk_screen_get_monitor_plug_name (gscreen, i); #endif @@ -5041,6 +5041,7 @@ Internal use only, use `display-monitor-attributes-list' instead. */) primary_monitor, monitor_frames, source); + xfree (monitors); unblock_input (); #else /* not USE_GTK */ -- 2.21.0 --=-=-=--