zynaddsubfx

commit d7186263dd9357cb7cebf41fc8bf245da543f50f
parent 0cfbc696e87562b6aa854e17db94fdeb39ef8783
Author: fundamental <[email protected]>
Date:   Fri,  6 Nov 2015 22:53:44 -0500

Remove Undefined Behavior In FilterParams::Paste

Diffstat:
M
src/Params/FilterParams.cpp
 | 
38
++++++++++++++++++++++++++++++++++----

1 file changed, 34 insertions(+), 4 deletions(-)
diff --git a/src/Params/FilterParams.cpp b/src/Params/FilterParams.cpp
@@ -420,13 +420,43 @@ void FilterParams::getfromXML(XMLwrapper *xml)
     }
 }
 
+#define COPY(y) this->y = x.y
 void FilterParams::paste(FilterParams &x)
 {
-    //Avoid undefined behavior
-    if(&x == this)
-        return;
-    memcpy((char*)this, (const char*)&x, sizeof(*this));
+    COPY(Pcategory);
+    COPY(Ptype);
+    COPY(Pfreq);
+    COPY(Pq);
+    COPY(Pstages);
+    COPY(Pfreqtrack);
+    COPY(Pgain);
+
+    COPY(Pnumformants);
+    COPY(Pformantslowness);
+    COPY(Pvowelclearness);
+    COPY(Pcenterfreq);
+    COPY(Poctavesfreq);
+
+    for(int i=0; i<FF_MAX_VOWELS; ++i) {
+        for(int j=0; j<FF_MAX_FORMANTS; ++j) {
+            auto &a = this->Pvowels[i].formants[j];
+            auto &b = x.Pvowels[i].formants[j];
+            a.freq = b.freq;
+            a.amp  = b.amp;
+            a.q    = b.q;
+        }
+    }
+
+
+    COPY(Psequencesize);
+    COPY(Psequencestretch);
+    COPY(Psequencereversed);
+    for(int i=0; i<FF_MAX_SEQUENCE; ++i)
+        this->Psequence[i] = x.Psequence[i];
+
+    COPY(changed);
 }
+#undef COPY
 
 void FilterParams::pasteArray(FilterParams &x, int nvowel)
 {