You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Kamesh Jayachandran <ka...@collab.net> on 2008/08/19 18:14:57 UTC

Re: svn commit: r32558 - trunk/subversion/libsvn_fs_fs

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Is it not applicable for bdb?

With regards
Kamesh Jayachandran

cmpilato@tigris.org wrote:
> Author: cmpilato
> Date: Tue Aug 19 10:23:16 2008
> New Revision: 32558
> 
> Log:
> Fix SEGFAULT introduced in r32545.
> 
> * subversion/libsvn_fs_fs/tree.c
>   (fs_node_origin_rev): Avoid dup'ing a NULL pointer.
> 
> Modified:
>    trunk/subversion/libsvn_fs_fs/tree.c
> 
> Modified: trunk/subversion/libsvn_fs_fs/tree.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_fs_fs/tree.c?pathrev=32558&r1=32557&r2=32558
> ==============================================================================
> --- trunk/subversion/libsvn_fs_fs/tree.c	Tue Aug 19 09:53:49 2008	(r32557)
> +++ trunk/subversion/libsvn_fs_fs/tree.c	Tue Aug 19 10:23:16 2008	(r32558)
> @@ -3084,7 +3084,7 @@ fs_node_origin_rev(svn_revnum_t *revisio
>             (which is allocated in SUBPOOL ... maybe). */
>          svn_pool_clear(predidpool);
>          SVN_ERR(svn_fs_fs__dag_get_predecessor_id(&pred_id, node, subpool));
> -        pred_id = svn_fs_fs__id_copy(pred_id, predidpool);
> +        pred_id = pred_id ? svn_fs_fs__id_copy(pred_id, predidpool) : NULL;
>        }
>  
>      /* When we get here, NODE should be the first node-revision in our
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org
> 
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIqw2h3WHvyO0YTCwRAk4sAJ9S6eO8mv6/B/yUYu4DscSCksREyQCfW0oJ
THQhPPYdM3YUxgNTTDw7TtY=
=Pyus
-----END PGP SIGNATURE-----

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

Re: svn commit: r32558 - trunk/subversion/libsvn_fs_fs

Posted by "C. Michael Pilato" <cm...@collab.net>.
Okay, yes, I think BDB was fine.  The logic there is a little different from
that of FSFS, and that was causing me some doubt.  Thanks (seriously, not
sarcastically) for causing me to double-check that logic Just In Case.

C. Michael Pilato wrote:
> Hrm.  Let me double-check the surrounding code, though.  Something doesn't
> feel right...
> 
> 
> C. Michael Pilato wrote:
>> No, the BDB logic jumps out of the loop if the pred_id is NULL before trying
>> to dup it.
>>
>>
>> Kamesh Jayachandran wrote:
>>> Is it not applicable for bdb?
>>>
>>> With regards
>>> Kamesh Jayachandran
>>>
>>> cmpilato@tigris.org wrote:
>>>> Author: cmpilato
>>>> Date: Tue Aug 19 10:23:16 2008
>>>> New Revision: 32558
>>>> Log:
>>>> Fix SEGFAULT introduced in r32545.
>>>> * subversion/libsvn_fs_fs/tree.c
>>>>   (fs_node_origin_rev): Avoid dup'ing a NULL pointer.
> 
> 


-- 
C. Michael Pilato <cm...@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand


Re: svn commit: r32558 - trunk/subversion/libsvn_fs_fs

Posted by "C. Michael Pilato" <cm...@collab.net>.
Hrm.  Let me double-check the surrounding code, though.  Something doesn't
feel right...


C. Michael Pilato wrote:
> No, the BDB logic jumps out of the loop if the pred_id is NULL before trying
> to dup it.
> 
> 
> Kamesh Jayachandran wrote:
>> Is it not applicable for bdb?
>>
>> With regards
>> Kamesh Jayachandran
>>
>> cmpilato@tigris.org wrote:
>>> Author: cmpilato
>>> Date: Tue Aug 19 10:23:16 2008
>>> New Revision: 32558
>>> Log:
>>> Fix SEGFAULT introduced in r32545.
>>> * subversion/libsvn_fs_fs/tree.c
>>>   (fs_node_origin_rev): Avoid dup'ing a NULL pointer.
> 


-- 
C. Michael Pilato <cm...@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand


Re: svn commit: r32558 - trunk/subversion/libsvn_fs_fs

Posted by "C. Michael Pilato" <cm...@collab.net>.
No, the BDB logic jumps out of the loop if the pred_id is NULL before trying
to dup it.


Kamesh Jayachandran wrote:
> Is it not applicable for bdb?
> 
> With regards
> Kamesh Jayachandran
> 
> cmpilato@tigris.org wrote:
>> Author: cmpilato
>> Date: Tue Aug 19 10:23:16 2008
>> New Revision: 32558
> 
>> Log:
>> Fix SEGFAULT introduced in r32545.
> 
>> * subversion/libsvn_fs_fs/tree.c
>>   (fs_node_origin_rev): Avoid dup'ing a NULL pointer.

-- 
C. Michael Pilato <cm...@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand