Re: svn commit: r16128 - trunk/subversion/libsvn_fs_base

Philip Martin <philip@codematters.co.uk> writes:

> "D.J. Heap" <djheap@gmail.com> writes:
>
> > "C. Michael Pilato" <cmpilato@collab.net > writes:
> > > > /* If any of the three entries is of type file, flag a conflict. */
> > > > - if (s_entry->kind == svn_node_file
> > > > - || t_entry->kind == svn_node_file
> > > > - || a_entry->kind == svn_node_file)
> > > > + if ((svn_fs_base__dag_node_kind (s_ent_node) == svn_node_file)
> > > > + || (svn_fs_base__dag_node_kind (t_ent_node) == svn_node_file)
> > > > + || (svn_fs_base__dag_node_kind (a_ent_node) == svn_node_file))
> > > > return conflict_err (conflict_p,
> > > > svn_path_join (target_path,
> > > > a_entry->name,
> > >
>
> > I'm getting compiler warnings here (that look accurate to me) indicating
> > that s_ent_node, t_ent_node, and a_ent_node are being used without being
> > initialized?
>
> Eeek! Yes, that looks like a serious bug. The calls to
> svn_fs_base__dag_node_kind have to happen after the calls to
> svn_fs_base__dag_get_node, so one or the other must be moved.

Yeesh. My bad; will fix.

-- 
C. Michael Pilato <cmpilato@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org