Re: svn commit: r1935991 - in subversion/branches/1.15.x: . subversion/libsvn_client

On Wed, 8 Jul 2026 at 06:19, Branko Čibej <[email protected]> wrote:

> On 8. 7. 2026 06:00, [email protected] wrote:
>
> Author: svn-role
> Date: Wed Jul  8 04:00:41 2026
> New Revision: 1935991
>
> Log:
> Merge the r1934787 group from trunk:
>
>  * r1934787, r1934811
>    Fix potential use of uninitialized memory in the conflict resolver.
>    Justification:
>      Subversion should try to not crash.
>    Votes:
>      +1: brane, ivan, kotkov
>
> Modified:
>    subversion/branches/1.15.x/   (props changed)
>    subversion/branches/1.15.x/STATUS
>    subversion/branches/1.15.x/subversion/libsvn_client/conflicts.c
>
>
>
> I realise now that I made a mistake here: we're not supposed to leave
> SVN_DBG() macros in trunk code, they're intended only for developer
> testing. It's not a showstopper for 1.15.0, can be fixed on trunk and
> trivially back-ported after the release.
>
> This SVN_DBG statement are protected with #ifdef SVN_DEBUG. We already
have SVN_DBG() in the trunk with #ifdef SVN_DEBUG in the same file.


-- 
Ivan Zhakov