You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Daniel Rall <dl...@collab.net> on 2006/12/11 21:03:49 UTC

Re: svn commit: r22649 - branches/ra_dav-refactoring/subversion/libsvn_ra_dav

On Mon, 11 Dec 2006, dionisos@tigris.org wrote:
...
> ra_dav-refactoring: Fix the assert() [the Neon resource may be NULL, not ours].
...
> --- branches/ra_dav-refactoring/subversion/libsvn_ra_dav/util.c	(original)
> +++ branches/ra_dav-refactoring/subversion/libsvn_ra_dav/util.c	Mon Dec 11 12:45:43 2006
> @@ -244,7 +244,8 @@
>    req->method = apr_pstrdup(req->pool, method);
>    req->url = apr_pstrdup(req->pool, url);
>  
> -  assert(req != NULL);
> +  /* Neon resources may be NULL on out-of-memory */
> +  assert(req->req != NULL);
>    apr_pool_cleanup_register(reqpool, req,
>                              dav_request_cleanup,
>                              apr_pool_cleanup_null);

This type of problem would be less likely to come up if the Neon
request was named to differentiate it from our libsvn_ra_dav request
(e.g. req->ne_req).  We currently seem to use req->req in quite a few
places...

Re: svn commit: r22649 - branches/ra_dav-refactoring/subversion/libsvn_ra_dav

Posted by Erik Huelsmann <eh...@gmail.com>.
On 12/11/06, Daniel Rall <dl...@collab.net> wrote:
> On Mon, 11 Dec 2006, dionisos@tigris.org wrote:
> ...
> > ra_dav-refactoring: Fix the assert() [the Neon resource may be NULL, not ours].
> ...
> > --- branches/ra_dav-refactoring/subversion/libsvn_ra_dav/util.c       (original)
> > +++ branches/ra_dav-refactoring/subversion/libsvn_ra_dav/util.c       Mon Dec 11 12:45:43 2006
> > @@ -244,7 +244,8 @@
> >    req->method = apr_pstrdup(req->pool, method);
> >    req->url = apr_pstrdup(req->pool, url);
> >
> > -  assert(req != NULL);
> > +  /* Neon resources may be NULL on out-of-memory */
> > +  assert(req->req != NULL);
> >    apr_pool_cleanup_register(reqpool, req,
> >                              dav_request_cleanup,
> >                              apr_pool_cleanup_null);
>
> This type of problem would be less likely to come up if the Neon
> request was named to differentiate it from our libsvn_ra_dav request
> (e.g. req->ne_req).  We currently seem to use req->req in quite a few
> places...

Yea, I'll do that. Thanks.

bye,

Erik.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org