Mailing-List: contact dev-help@apr.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: neutral (athena.apache.org: 76.96.27.212 is neither permitted
 nor denied by domain of jim@jagunet.com)
Content-Type: text/plain; charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.2\))
Subject: Re: svn commit: r1604598 - in /apr/apr/trunk: CHANGES
 tables/apr_skiplist.c
From: Jim Jagielski <jim@jaguNET.com>
In-Reply-To: <20140622151021.6C409238889B@eris.apache.org>
Date: Tue, 24 Jun 2014 10:57:43 -0400
Cc: commits@apr.apache.org
Content-Transfer-Encoding: quoted-printable
Message-Id: <136B7204-CF52-405B-B17A-8DC8F9457722@jaguNET.com>
References: <20140622151021.6C409238889B@eris.apache.org>
To: dev@apr.apache.org

Is this suitable for 1.5 and 1.6 as well?

On Jun 22, 2014, at 11:10 AM, covener@apache.org wrote:

> Author: covener
> Date: Sun Jun 22 15:10:20 2014
> New Revision: 1604598
>=20
> URL: http://svn.apache.org/r1604598
> Log:
> apr_skiplist becomes corrupt when nodes are reused.
>=20
> Submitted By: Takashi Sato <takashi tks st>, covener
> committed By: covener
>=20
>=20
> Modified:
>    apr/apr/trunk/CHANGES
>    apr/apr/trunk/tables/apr_skiplist.c
>=20
> Modified: apr/apr/trunk/CHANGES
> URL: =
http://svn.apache.org/viewvc/apr/apr/trunk/CHANGES?rev=3D1604598&r1=3D1604=
597&r2=3D1604598&view=3Ddiff
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- apr/apr/trunk/CHANGES [utf-8] (original)
> +++ apr/apr/trunk/CHANGES [utf-8] Sun Jun 22 15:10:20 2014
> @@ -1,6 +1,10 @@
>                                                      -*- coding: utf-8 =
-*-
> Changes for APR 2.0.0
>=20
> +  *) apr_skiplist: Fix potential corruption of skiplists leading to=20=

> +     results or crashes. [Takashi Sato <takashi tks st>, Eric =
Covener]
> +     PR 56654.
> +
>   *) apr_skiplist: Add apr_skiplist_add() to support multiple values.
>=20
>   *) apr_allocator: Be less wasteful and don't return a memnode that =
is
>=20
> Modified: apr/apr/trunk/tables/apr_skiplist.c
> URL: =
http://svn.apache.org/viewvc/apr/apr/trunk/tables/apr_skiplist.c?rev=3D160=
4598&r1=3D1604597&r2=3D1604598&view=3Ddiff
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- apr/apr/trunk/tables/apr_skiplist.c (original)
> +++ apr/apr/trunk/tables/apr_skiplist.c Sun Jun 22 15:10:20 2014
> @@ -379,11 +379,9 @@ static apr_skiplistnode *insert_compare(
>             (apr_skiplistnode *)apr_skiplist_alloc(sl, =
sizeof(apr_skiplistnode));
>         sl->top->up->down =3D sl->top;
>         sl->top =3D sl->topend =3D sl->top->up;
> -#if 0
>         sl->top->prev =3D sl->top->next =3D sl->top->nextindex =3D
>             sl->top->previndex =3D sl->top->up =3D NULL;
>         sl->top->data =3D NULL;
> -#endif
>         sl->top->sl =3D sl;
>     }
>     ch =3D sl->height;
>=20
>=20