From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Antipov Newsgroups: gmane.emacs.bugs Subject: bug#16502: segmentation fault with org-capture Date: Mon, 20 Jan 2014 13:30:47 +0400 Message-ID: <52DCECC7.9080705@yandex.ru> References: <52DCDC6B.9090209@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------000706000709090708020707" X-Trace: ger.gmane.org 1390210278 14353 80.91.229.3 (20 Jan 2014 09:31:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 20 Jan 2014 09:31:18 +0000 (UTC) Cc: 16502@debbugs.gnu.org To: Nathan Froyd Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Jan 20 10:31:21 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1W5BCT-0001i5-7q for geb-bug-gnu-emacs@m.gmane.org; Mon, 20 Jan 2014 10:31:21 +0100 Original-Received: from localhost ([::1]:49500 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5BCS-0006P3-RK for geb-bug-gnu-emacs@m.gmane.org; Mon, 20 Jan 2014 04:31:20 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54518) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5BCH-0006MP-PX for bug-gnu-emacs@gnu.org; Mon, 20 Jan 2014 04:31:16 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W5BCA-00043s-RR for bug-gnu-emacs@gnu.org; Mon, 20 Jan 2014 04:31:09 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:43562) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5BCA-00043o-Kl for bug-gnu-emacs@gnu.org; Mon, 20 Jan 2014 04:31:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1W5BC9-00025c-Vt for bug-gnu-emacs@gnu.org; Mon, 20 Jan 2014 04:31:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Antipov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 20 Jan 2014 09:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 16502 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 16502-submit@debbugs.gnu.org id=B16502.13902102548017 (code B ref 16502); Mon, 20 Jan 2014 09:31:01 +0000 Original-Received: (at 16502) by debbugs.gnu.org; 20 Jan 2014 09:30:54 +0000 Original-Received: from localhost ([127.0.0.1]:57581 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1W5BC1-00025E-EZ for submit@debbugs.gnu.org; Mon, 20 Jan 2014 04:30:53 -0500 Original-Received: from forward7l.mail.yandex.net ([84.201.143.140]:53569) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1W5BBx-000250-LD for 16502@debbugs.gnu.org; Mon, 20 Jan 2014 04:30:51 -0500 Original-Received: from smtp2h.mail.yandex.net (smtp2h.mail.yandex.net [84.201.187.145]) by forward7l.mail.yandex.net (Yandex) with ESMTP id 1A1B8BC0C97; Mon, 20 Jan 2014 13:30:48 +0400 (MSK) Original-Received: from smtp2h.mail.yandex.net (localhost [127.0.0.1]) by smtp2h.mail.yandex.net (Yandex) with ESMTP id B01221701D97; Mon, 20 Jan 2014 13:30:47 +0400 (MSK) Original-Received: from unknown (unknown [37.139.80.10]) by smtp2h.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id YpL8oqjZFO-Ulq4QoCt; Mon, 20 Jan 2014 13:30:47 +0400 (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (Client certificate not present) X-Yandex-Uniq: 6c62a37c-0c18-4d96-92a2-24bacec5e9c6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1390210247; bh=0d5ggoVbrb9bdTbpJJoZ0O0gZJkmV5jy5XLuxtIYooM=; h=Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: References:In-Reply-To:Content-Type; b=L93cc4ZOWHkBS3pWd2eTOj+HCIbzYAjC++eBrjqInnDn1gaHTR9Y7xse6NqVoA6I1 jIFUbamnm0W6/ILKnB0R4uC/kAEnPAzOB1gFbM9zBc7izpMAx2dCPjl0Wz1ZlJuROa lbE+AltfsB9DyV/0BELhX059CtEZQ/Mq34J/PXDs= Authentication-Results: smtp2h.mail.yandex.net; dkim=pass header.i=@yandex.ru User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 In-Reply-To: <52DCDC6B.9090209@yandex.ru> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:83760 Archived-At: This is a multi-part message in MIME format. --------------000706000709090708020707 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 01/20/2014 12:20 PM, Dmitry Antipov wrote: > Could you please run undumped (temacs) under valgrind? ...and please try this patch (for trunk), if possible. Dmitry --------------000706000709090708020707 Content-Type: text/x-patch; name="bug16502.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="bug16502.patch" =3D=3D=3D modified file 'src/buffer.c' --- src/buffer.c 2014-01-01 07:43:34 +0000 +++ src/buffer.c 2014-01-20 09:22:59 +0000 @@ -1867,6 +1867,7 @@ =20 if (b->base_buffer) { + INTERVAL i; /* Unchain all markers that belong to this indirect buffer. Don't unchain the markers that belong to the base buffer or its other indirect buffers. */ @@ -1881,6 +1882,14 @@ else mp =3D &m->next; } + /* Intervals should be owned by the base buffer (Bug#16502). */ + i =3D buffer_intervals (b); + if (i) + { + Lisp_Object owner; + XSETBUFFER (owner, b->base_buffer); + set_interval_object (i, owner); + } } else { =3D=3D=3D modified file 'src/intervals.c' --- src/intervals.c 2014-01-01 07:43:34 +0000 +++ src/intervals.c 2014-01-20 09:21:55 +0000 @@ -60,16 +60,7 @@ =0C /* Utility functions for intervals. */ =20 -/* Use these functions to set Lisp_Object - or pointer slots of struct interval. */ - -static void -set_interval_object (INTERVAL i, Lisp_Object obj) -{ - eassert (BUFFERP (obj) || STRINGP (obj)); - i->up_obj =3D 1; - i->up.obj =3D obj; -} +/* Use these functions to set pointer slots of struct interval. */ =20 static void set_interval_left (INTERVAL i, INTERVAL left) =3D=3D=3D modified file 'src/intervals.h' --- src/intervals.h 2014-01-01 07:43:34 +0000 +++ src/intervals.h 2014-01-20 09:22:10 +0000 @@ -134,6 +134,14 @@ or pointer slots of struct interval. */ =20 INLINE void +set_interval_object (INTERVAL i, Lisp_Object obj) +{ + eassert (BUFFERP (obj) || STRINGP (obj)); + i->up_obj =3D 1; + i->up.obj =3D obj; +} + +INLINE void set_interval_parent (INTERVAL i, INTERVAL parent) { i->up_obj =3D false; --------------000706000709090708020707--