Re: gEDA-dev: Before 1.4.0?

[Werner Hoch <werner_dot_ho-at-NOSPAMgmx_dot_de>]

Hi Peter,

On Samstag, 19. Januar 2008, Peter Clifton wrote:
> On Sat, 2008-01-19 at 12:43 +0000, a r wrote:
> > On Jan 17, 2008 12:52 PM, Peter Clifton <pcjc2@cam.ac.uk> wrote:
> > > Fix net consolidating crash:
> > >   Sorry, I've not yet had chance to dig deeper into whether the
> > > "fix" I proposed is right or not. I've been on a self imposed
> > > computer ban, leaving my laptop power adaptor at the lab until I
> > > can learn to sleep at sensible times! (And have been otherwise
> > > busy with work)
> >
> > The patch works well for me. I haven't noticed any crashes since I
> > applied it. I haven't tested it with valgrind, though.
>
> Thanks for the testing... it keeps valgrind happy here. My main
> concern was that I hadn't checked through the code paths thoroughly
> to ensure it wouldn't cause any extra visual artifacts. Seems OK
> though. I'll try to ensure I push something by Wednesday.

I've tested the patch to. It works fine but I'd move the patch towards 
the creation of the lists inside the if conditions:
  if (!primary_zero_length ) {
and
  if (!secondary_zero_length && !found_primary_connection) {

---------
diff --git a/gschem/src/o_net.c b/gschem/src/o_net.c
index 7adca6b..97d6b54 100644
--- a/gschem/src/o_net.c
+++ b/gschem/src/o_net.c
@@ -447,6 +447,9 @@ int o_net_end(GSCHEM_TOPLEVEL *w_current, int x, int 
y)
       if (toplevel->net_consolidate == TRUE && !w_current->CONTROLKEY) 
{
          o_net_consolidate_segments(toplevel, new_net);
       }
+
+      g_list_free(other_objects);
+      other_objects = NULL;
   }


@@ -497,10 +500,12 @@ int o_net_end(GSCHEM_TOPLEVEL *w_current, int x, 
int y)
       if (toplevel->net_consolidate == TRUE && !w_current->CONTROLKEY) 
{
          o_net_consolidate_segments(toplevel, new_net);
       }
+
+      g_list_free(other_objects);
+      other_objects = NULL;
   }

   /* LEAK CHECK 3 */
-  g_list_free(other_objects);

   toplevel->page_current->CHANGED = 1;
   w_current->start_x = w_current->save_x;
-------

Regards
Werner



_______________________________________________
geda-dev mailing list
geda-dev@moria.seul.org
http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev