Re: svn commit: r1095914 - in /subversion/trunk/subversion: include/svn_wc.h libsvn_client/merge.c libsvn_wc/deprecated.c libsvn_wc/props.c libsvn_wc/props.h libsvn_wc/update_editor.c

Philip Martin <philip.martin_at_wandisco.com> writes:

> Greg Stein <gstein_at_gmail.com> writes:
>
>> Update: this is caused by CONTENT_STATE in close_file() not getting a
>> proper value when fb->obstruction_found==1. It affects the
>> notification later in the function.
>>
>> I'll tease out the logic tomorrow...
>
> I get a valgrind errors:

Bert's r1099012 fixed some of the errors, but I'm still getting a SEGV
after this:

$ ./checkout_tests.py 4 -v
[...]
CMD: svn co file:///home/pm/sw/subversion/obj/subversion/tests/cmdline/svn-test-work/repositories/checkout_tests-4 svn-test-work/working_copies/checkout_tests-4 --force --config-dir /home/pm/sw/subversion/obj/subversion/tests/cmdline/svn-test-work/local_tmp/config --password rayjandom --no-auth-cache --username jrandom
E svn-test-work/working_copies/checkout_tests-4/A
A svn-test-work/working_copies/checkout_tests-4/A/B
A svn-test-work/working_copies/checkout_tests-4/A/B/lambda
==15050== Invalid read of size 8
==15050== at 0x51102EA: close_file (update_editor.c:3988)
==15050== by 0x557A503: close_file (cancel.c:234)
==15050== by 0x557A503: close_file (cancel.c:234)
==15050== by 0x6A40172: update_entry (reporter.c:943)
==15050== by 0x6A40B4B: delta_dirs (reporter.c:1187)
==15050== by 0x6A3FDCD: update_entry (reporter.c:908)
==15050== by 0x6A40B4B: delta_dirs (reporter.c:1187)
==15050== by 0x6A3FDCD: update_entry (reporter.c:908)
==15050== by 0x6A40B4B: delta_dirs (reporter.c:1187)
==15050== by 0x6A4107D: drive (reporter.c:1251)
==15050== by 0x6A41563: finish_report (reporter.c:1318)
==15050== by 0x6A419AB: svn_repos_finish_report (reporter.c:1408)
==15050== Address 0xafc93e8 is 120 bytes inside a block of size 128 free'd
==15050== at 0x4C240FD: free (vg_replace_malloc.c:366)
==15050== by 0x5E565A8: pool_clear_debug (apr_pools.c:1532)
==15050== by 0x5E566ED: pool_destroy_debug (apr_pools.c:1594)
==15050== by 0x51102E2: close_file (update_editor.c:3985)
==15050== by 0x557A503: close_file (cancel.c:234)
==15050== by 0x557A503: close_file (cancel.c:234)
==15050== by 0x6A40172: update_entry (reporter.c:943)
==15050== by 0x6A40B4B: delta_dirs (reporter.c:1187)
==15050== by 0x6A3FDCD: update_entry (reporter.c:908)
==15050== by 0x6A40B4B: delta_dirs (reporter.c:1187)
==15050== by 0x6A3FDCD: update_entry (reporter.c:908)
==15050== by 0x6A40B4B: delta_dirs (reporter.c:1187)
==15050==
==15050== Invalid read of size 4
==15050== at 0x51072D7: maybe_release_dir_info (update_editor.c:635)
==15050== by 0x51102F5: close_file (update_editor.c:3988)
==15050== by 0x557A503: close_file (cancel.c:234)
==15050== by 0x557A503: close_file (cancel.c:234)
==15050== by 0x6A40172: update_entry (reporter.c:943)
==15050== by 0x6A40B4B: delta_dirs (reporter.c:1187)
==15050== by 0x6A3FDCD: update_entry (reporter.c:908)
==15050== by 0x6A40B4B: delta_dirs (reporter.c:1187)
==15050== by 0x6A3FDCD: update_entry (reporter.c:908)
==15050== by 0x6A40B4B: delta_dirs (reporter.c:1187)
==15050== by 0x6A4107D: drive (reporter.c:1251)
==15050== by 0x6A41563: finish_report (reporter.c:1318)
==15050== Address 0x4141414141414149 is not stack'd, malloc'd or (recently) free'd
==15050==

-- 
Philip