Patchwork revlog: fix size of Python nodetree object

login
register
mail settings
Submitter Yuya Nishihara
Date Sept. 4, 2018, 4:38 a.m.
Message ID <b69fbdd77c405dc755a4.1536035905@mimosa>
Download mbox | patch
Permalink /patch/34273/
State Accepted
Headers show

Comments

Yuya Nishihara - Sept. 4, 2018, 4:38 a.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1536035361 -32400
#      Tue Sep 04 13:29:21 2018 +0900
# Node ID b69fbdd77c405dc755a45ddf93c6388a4a1915ae
# Parent  1cbe19eb496d2dd8d4c8cae849a513348fefadf2
revlog: fix size of Python nodetree object

Follows up 9f097214fbf3.
Matt Harbison - Sept. 4, 2018, 1:20 p.m.
> On Sep 4, 2018, at 12:38 AM, Yuya Nishihara <yuya@tcha.org> wrote:
> 
> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1536035361 -32400
> #      Tue Sep 04 13:29:21 2018 +0900
> # Node ID b69fbdd77c405dc755a45ddf93c6388a4a1915ae
> # Parent  1cbe19eb496d2dd8d4c8cae849a513348fefadf2
> revlog: fix size of Python nodetree object

That fixed the crash, thanks.
Pulkit Goyal - Sept. 4, 2018, 3:11 p.m.
On Tue, Sep 4, 2018 at 4:21 PM Matt Harbison <mharbison72@gmail.com> wrote:

>
> > On Sep 4, 2018, at 12:38 AM, Yuya Nishihara <yuya@tcha.org> wrote:
> >
> > # HG changeset patch
> > # User Yuya Nishihara <yuya@tcha.org>
> > # Date 1536035361 -32400
> > #      Tue Sep 04 13:29:21 2018 +0900
> > # Node ID b69fbdd77c405dc755a45ddf93c6388a4a1915ae
> > # Parent  1cbe19eb496d2dd8d4c8cae849a513348fefadf2
> > revlog: fix size of Python nodetree object
>
> That fixed the crash, thanks.
>

Queued as per Matt's review. Many thanks!
via Mercurial-devel - Sept. 4, 2018, 3:22 p.m.
Yes, thanks for fixing!

On Tue, Sep 4, 2018 at 8:13 AM Pulkit Goyal <7895pulkit@gmail.com> wrote:

>
>
> On Tue, Sep 4, 2018 at 4:21 PM Matt Harbison <mharbison72@gmail.com>
> wrote:
>
>>
>> > On Sep 4, 2018, at 12:38 AM, Yuya Nishihara <yuya@tcha.org> wrote:
>> >
>> > # HG changeset patch
>> > # User Yuya Nishihara <yuya@tcha.org>
>> > # Date 1536035361 -32400
>> > #      Tue Sep 04 13:29:21 2018 +0900
>> > # Node ID b69fbdd77c405dc755a45ddf93c6388a4a1915ae
>> > # Parent  1cbe19eb496d2dd8d4c8cae849a513348fefadf2
>> > revlog: fix size of Python nodetree object
>>
>> That fixed the crash, thanks.
>>
>
> Queued as per Matt's review. Many thanks!
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>

Patch

diff --git a/mercurial/cext/revlog.c b/mercurial/cext/revlog.c
--- a/mercurial/cext/revlog.c
+++ b/mercurial/cext/revlog.c
@@ -1249,7 +1249,7 @@  static PyMethodDef ntobj_methods[] = {
 static PyTypeObject nodetreeType = {
 	PyVarObject_HEAD_INIT(NULL, 0) /* header */
 	"parsers.nodetree",        /* tp_name */
-	sizeof(nodetree) ,         /* tp_basicsize */
+	sizeof(nodetreeObject) ,   /* tp_basicsize */
 	0,                         /* tp_itemsize */
 	(destructor)ntobj_dealloc, /* tp_dealloc */
 	0,                         /* tp_print */