Another segfault in the wc prop merge code...

It appears that there is another bug lingering in the wc prop merge code.
It's possible for the server_baseprops parameter to svn_wc__merge_props() to
be NULL. The following statement in svn_wc__merge_props() causes the
segfault:
 from_val = apr_hash_get (server_baseprops, propname, APR_HASH_KEY_STRING);

I'm not sure what the correct behavior should be. Looking at
svn_wc_merge_props() it's unclear whether baseprops is allowed to be NULL
(baseprops eventually makes it's way down as server_baseprops in
svn_wc__merge_props()). So I decided to toss this to the list to see what
the WC experts think of the situation.

Reproduction recipe:

svn up -r15856
svn merge \
  http://svn.collab.net/repos/svn/branches/python-bindings-improvements \
  -r15854:15856 .

The merge will generate the segfault.

-John

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Aug 21 16:42:45 2005