On Wed, Feb 03, 2010 at 04:27:39PM +0000, Philip Martin wrote:
> Philip Martin <philip.mar...@wandisco.com> writes:
>
> > Note the silly fuzz values. Valgrind shows:
>
> I just got r906107, the problem is still there but the call stack is
> slightly different:
>
> $ valgrind -q ../../../subversion/svn/.libs/lt-svn patch x.patch
> svn-test-work/working_copies/patch_tests-9
> U svn-test-work/working_copies/patch_tests-9/A/mu
> ==4268== Conditional jump or move depends on uninitialised value(s)
> ==4268== at 0x5E03BF3: conv_10_quad (apr_snprintf.c:395)
> ==4268== by 0x5E04C9F: apr_vformatter (apr_snprintf.c:862)
> ==4268== by 0x5E119CB: apr_pvsprintf (apr_pools.c:1682)
> ==4268== by 0x5978D23: svn_cmdline_printf (cmdline.c:275)
> ==4268== by 0x41706D: notify (notify.c:364)
> ==4268== by 0x4E79891: send_patch_notification (patch.c:1022)
> ==4268== by 0x4E7AA55: apply_patches (patch.c:1420)
> ==4268== by 0x50D67F9: svn_wc__call_with_write_lock (lock.c:1863)
> ==4268== by 0x4E7ABBA: svn_client_patch (patch.c:1449)
> ==4268== by 0x418B1E: svn_cl__patch (patch-cmd.c:79)
> ==4268== by 0x414A11: main (main.c:2234)
> > applied hunk @@ -1,6 +1,7 @@ with fuzz 1
> > applied hunk @@ -7,6 +8,7 @@ with fuzz 2
> > applied hunk @@ -19,6 +20,7 @@ with offset 1 and fuzz 2
Does this fix it?
Thanks,
Stefan
Index: subversion/svn/notify.c
===================================================================
--- subversion/svn/notify.c (revision 906159)
+++ subversion/svn/notify.c (working copy)
@@ -334,7 +334,7 @@ notify(void *baton, const svn_wc_notify_t *n, apr_
if ((err = svn_cmdline_printf(pool,
apr_pstrcat(pool, s,
"%"APR_UINT64_T_FMT
- " and fuzz %lu\n",
+ " and fuzz %d\n",
NULL),
n->hunk_original_start,
n->hunk_original_length,
@@ -363,7 +363,7 @@ notify(void *baton, const svn_wc_notify_t *n, apr_
{
if ((err = svn_cmdline_printf(pool,
_("> applied hunk @@ -%lu,%lu +%lu,%lu @@ "
- "with fuzz %lu\n"),
+ "with fuzz %d\n"),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,
