> Hi Kamesh,
>
> Your change to call either discover_and_merge_children or do_merge
> allowed my compiler to finally catch this:
>
> c:\svn\src-trunk\subversion\libsvn_client\merge.c(3813) : warning C4700:
> uninitialized local variable 'children_with_mergeinfo' used
>
> This will lead to a segfault in drive_merge_report_editor() if
> do_merge() is ever called. Our test suite never provokes a situation
> like this, but it's easy enough to replicate:
>
> Copy some directory DIR to DIR_COPY and commit it at rN
> Make a modification to DIR in rN+1
> Move DIR to DIR_MOVED in rN+2
> Make a modification to DIR_MOVED in rN+3
> Merge -rN:N+3 DIR_MOVED DIR_COPY -- and boom!
>
> Anyhow, in r26813 I added an intialization and also tweaked
> drive_merge_report_editor() to check for a possible NULL
> children_with_mergeinfo (not really necessary right now, but you check
> it elsewhere in that function, so in the name of safety and
> consistency...
>
> Paul
>
>
Thanks Paul. Via r26822 addressed Dan's comments and few of my thoughts
on r26813.
With regards
Kamesh Jayachandran
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Sep 28 09:07:58 2007