From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 6 Jan 2007 16:00:49 +0000 (+0100)
Subject: Plug memory leak: copy quoted events only once.
X-Git-Tag: release/2.11.10-1~66
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6f33145f8046997d377d7a235e319d0c7a11975a;p=lilypond.git

Plug memory leak: copy quoted events only once.
---

diff --git a/lily/include/music.hh b/lily/include/music.hh
index f7e4407f3b..7b290482fa 100644
--- a/lily/include/music.hh
+++ b/lily/include/music.hh
@@ -66,6 +66,6 @@ SCM ly_camel_case_to_lisp_identifier (SCM name_sym);
 extern SCM ly_music_p_proc;
 
 /* common transposition function for music and event */
-SCM transpose_mutable (SCM alist, Pitch delta);
+void transpose_mutable (SCM alist, Pitch delta);
 
 #endif /* MUSIC_HH */
diff --git a/lily/music.cc b/lily/music.cc
index 83f88fbcd9..3dbbe123e5 100644
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -184,29 +184,28 @@ Music::compress (Moment factor)
 }
 
 /*
-  This mutates alist.  Hence, make sure that it is not changed 
+  This mutates alist.  Hence, make sure that it is not shared 
 */
-SCM
+void
 transpose_mutable (SCM alist, Pitch delta)
 {
-  SCM retval = SCM_EOL;
-
   for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s))
     {
       SCM entry = scm_car (s);
       SCM prop = scm_car (entry);
       SCM val = scm_cdr (entry);
-
+      SCM new_val = val;
+      
       if (Pitch *p = unsmob_pitch (val))
 	{
 	  Pitch transposed = p->transposed (delta);
-	  scm_set_cdr_x (entry, transposed.smobbed_copy ());
-
 	  if (transposed.get_alteration ().abs () > Rational (1,1))
 	    {
 	      warning (_f ("transposition by %s makes alteration larger than double",
 			   delta.to_string ()));
 	    }
+
+	  new_val = transposed.smobbed_copy ();
 	}
       else if (prop == ly_symbol2scm ("element"))
 	{
@@ -217,12 +216,11 @@ transpose_mutable (SCM alist, Pitch delta)
 	transpose_music_list (val, delta);
       else if (prop == ly_symbol2scm ("pitch-alist") &&
 	       scm_is_pair (val))
-	entry = scm_cons (prop,
-			  ly_transpose_key_alist (val, delta.smobbed_copy ()));
-      retval = scm_cons (entry, retval);
-    }
+	new_val = ly_transpose_key_alist (val, delta.smobbed_copy ());
 
-  return scm_reverse_x (retval, SCM_EOL);
+      if (val != new_val)
+	scm_set_cdr_x (entry , new_val);
+    }
 }
 
 void
@@ -231,7 +229,7 @@ Music::transpose (Pitch delta)
   if (to_boolean (get_property ("untransposable")))
     return;
 
-  mutable_property_alist_ = transpose_mutable (mutable_property_alist_, delta);
+  transpose_mutable (mutable_property_alist_, delta);
 }
 
 void
diff --git a/lily/quote-iterator.cc b/lily/quote-iterator.cc
index c55aae3428..09e91e6e38 100644
--- a/lily/quote-iterator.cc
+++ b/lily/quote-iterator.cc
@@ -246,8 +246,7 @@ Quote_iterator::process (Moment m)
 		  Pitch diff = pitch_interval (qp, mp);
 		  ev = ev->clone ();
 		  
-		  SCM props =  transpose_mutable (ev->get_property_alist (true), diff);
-		  ev = new Stream_event (ev->get_property ("class"), props);
+		  transpose_mutable (ev->get_property_alist (true), diff);
 		  transposed_musics_ = scm_cons (ev->unprotect (), transposed_musics_);
 		}
 	      quote_outlet_.get_outlet ()->event_source ()->broadcast (ev);