From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.bugs Subject: bug#32604: 26.1.50; memory leak in connect_network_socket Date: Tue, 04 Sep 2018 19:19:48 -0400 Message-ID: <87muswhmuj.fsf@gmail.com> References: <87k1o3rdgd.fsf@gmail.com> <0aad35d46cfe7a15d67484205d19340c.squirrel@weber.math.s.chiba-u.ac.jp> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1536103200 3886 195.159.176.226 (4 Sep 2018 23:20:00 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 4 Sep 2018 23:20:00 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) Cc: 32604@debbugs.gnu.org To: mituharu@math.s.chiba-u.ac.jp Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Sep 05 01:19:56 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fxKc0-0000sz-48 for geb-bug-gnu-emacs@m.gmane.org; Wed, 05 Sep 2018 01:19:56 +0200 Original-Received: from localhost ([::1]:52999 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxKe6-0006lD-GE for geb-bug-gnu-emacs@m.gmane.org; Tue, 04 Sep 2018 19:22:06 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60535) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fxKcR-0005gi-H3 for bug-gnu-emacs@gnu.org; Tue, 04 Sep 2018 19:20:28 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fxKcE-0006FZ-No for bug-gnu-emacs@gnu.org; Tue, 04 Sep 2018 19:20:16 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:41122) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fxKc9-0006CH-3Y for bug-gnu-emacs@gnu.org; Tue, 04 Sep 2018 19:20:08 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fxKc6-0002R3-Gv for bug-gnu-emacs@gnu.org; Tue, 04 Sep 2018 19:20:04 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Noam Postavsky Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 04 Sep 2018 23:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32604 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 32604-submit@debbugs.gnu.org id=B32604.15361031999348 (code B ref 32604); Tue, 04 Sep 2018 23:20:02 +0000 Original-Received: (at 32604) by debbugs.gnu.org; 4 Sep 2018 23:19:59 +0000 Original-Received: from localhost ([127.0.0.1]:46140 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fxKc2-0002Qh-RM for submit@debbugs.gnu.org; Tue, 04 Sep 2018 19:19:59 -0400 Original-Received: from mail-it0-f47.google.com ([209.85.214.47]:51558) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fxKc0-0002QS-Nm for 32604@debbugs.gnu.org; Tue, 04 Sep 2018 19:19:57 -0400 Original-Received: by mail-it0-f47.google.com with SMTP id e14-v6so7442376itf.1 for <32604@debbugs.gnu.org>; Tue, 04 Sep 2018 16:19:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=NCjxP+t2tSgL+hjAqhZgY0KlDj/1PAgYeLsl5SU6YZA=; b=KMkYd41Q1TP1b+xY0fI79JPL3j7Ce8WixWmmMYkasDcw8m4vqJBEkw9YwpCepKqAM8 2hWlFWIEShwgmoYhUM8wdWHubN+jdhylOzdt7hGEpbuUKkHIaBxk7YGYSQgskCcOf1R5 GkhxbybngBunXMgHAzmmz3dehOFdi+OvbEdaltGgLbGOC2K5tun2S0Gzc+zLUEfyWL+w h3wXUVyXEflQy/8HuUDZcH9lcMnU1eS1N6UHqAGySXbMkOzNHeoc2NbqUOoZlUFh09tH BQYgI5yS2iJ8BIU3J8rzSiqHcVWP8JKU++1ZCqjcm6kBpMP/awPpOEuZo2qF5ZM+Aena 77bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=NCjxP+t2tSgL+hjAqhZgY0KlDj/1PAgYeLsl5SU6YZA=; b=CrPkJwHpMyWAXuUESSczqj8BLl+ukp8jOD2ggLkHIXC+hqnLRZnOuC6Jay0coqx8Ua r6YX6h46jB39QjRG0DxhzsKaMIlc4se5gFPfrRZbqEPW8LxJ0v7LEz3VKpMjEnMtXUDG KT4iXHzjospjR22x1feEaBL4IDqYCsoipFSB8Ys5DnQf2172qvNCoEv99co51NLtk1kp sYRv2CyYNzYjCHnj+kiBpo01u7UXv5pGpYH898JDymYVkTIfDKxB3XCNOzwvKNElkSlF 76ijmlZuKd6RZ3GTrn6kn4uRFPheJeCfAJNdynrt8FNeYBbwmBq6kPwoAesECkvhcDEz UT0A== X-Gm-Message-State: APzg51CI1nZDgwNCLFMF3oEQ2mEVc7I88F8BQKyt91RIyeEl+377WrVS vgo1k3W28MPYF0fl1GBPglxmjD+V X-Google-Smtp-Source: ANB0VdbuP2u8RbObKXOxNSidMaJRA7qxjT46MPE9Y5ZL51zGNxHxrDSquNLqStZkKnGS53KgRu+aNA== X-Received: by 2002:a24:c682:: with SMTP id j124-v6mr2091691itg.143.1536103190170; Tue, 04 Sep 2018 16:19:50 -0700 (PDT) Original-Received: from zebian (cbl-45-2-119-34.yyz.frontiernetworks.ca. [45.2.119.34]) by smtp.googlemail.com with ESMTPSA id t64-v6sm506476ita.13.2018.09.04.16.19.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Sep 2018 16:19:49 -0700 (PDT) In-Reply-To: <0aad35d46cfe7a15d67484205d19340c.squirrel@weber.math.s.chiba-u.ac.jp> (mituharu's message of "Mon, 3 Sep 2018 15:02:00 +0900") 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: 208.118.235.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:150030 Archived-At: Looks good to me; a couple of minor suggestions below. mituharu@math.s.chiba-u.ac.jp writes: > @@ -3322,6 +3322,7 @@ connect_network_socket (Lisp_Object proc, > Lisp_Object addrinfos, > Lisp_Object use_external_socket_p) > { > ptrdiff_t count = SPECPDL_INDEX (); > + ptrdiff_t count1 UNINIT; > int s = -1, outch, inch; > int xerrno = 0; > int family; > @@ -3344,6 +3345,9 @@ connect_network_socket (Lisp_Object proc, > Lisp_Object addrinfos, > /* Do this in case we never enter the while-loop below. */ > s = -1; > > + record_unwind_protect_nothing (); > + count1 = SPECPDL_INDEX (); Since we assume a C99 compiler now, you could just do ptrdiff_t count1 = SPECPDL_INDEX (); without having the UNINIT thing. Also, since free is harmless on a NULL pointer, you could just record an unwind protect at the top once, without having the nothing state, I think.