[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: rev 2346 - trunk/subversion/include trunk/subversion/libsvn_wc trunk/subversion/libsvn_client trunk/subversion/tests/clients/cmdline

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-06-27 18:07:17 CEST

Ben Collins-Sussman <sussman@collab.net> writes:

> Oop, yeah, I see the bug. My fault, thanks. I'm possibly using an
> uninitialized variable... I'm just lucky that it hasn't yet segfaulted
> on my box. One patch coming right up.

Blair, since I can't reproduce the bug, will you try this patch for
me? If it works, please commit it.

Index: subversion/libsvn_wc/adm_crawler.c
===================================================================
--- subversion/libsvn_wc/adm_crawler.c
+++ subversion/libsvn_wc/adm_crawler.c Thu Jun 27 11:03:21 2002
@@ -629,6 +629,7 @@
       /* do nothing: baseprop hash should be -empty- for comparison
          purposes. if they already exist on disk, they're "leftover"
          from the old file that was replaced. */
+ props_base = NULL;
     }
   else
     /* the real prop-base hash */
@@ -645,7 +646,8 @@
 
   /* Load all properties into hashes */
   SVN_ERR (svn_wc__load_prop_file (props_tmp, localprops, pool));
- SVN_ERR (svn_wc__load_prop_file (props_base, baseprops, pool));
+ if (props_base)
+ SVN_ERR (svn_wc__load_prop_file (props_base, baseprops, pool));
   
   /* Get an array of local changes by comparing the hashes. */
   SVN_ERR (svn_wc_get_local_propchanges (&propmods, localprops,

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jun 27 18:11:42 2002

This is an archived mail posted to the Subversion Dev mailing list.