Karsten Wiese <annabellesgarden@yahoo.de>:

- Two Segmentation fault spots cleared.

diff --git a/us428control/Cus428State.cc b/us428control/Cus428State.cc
index ab8464e8d0204ac7b85d5a7398a74cb7777bb43a..d6bf76b9fff553adb6a34f0b85975e01e0676992 100644 (file)
--- a/us428control/Cus428State.cc
+++ b/us428control/Cus428State.cc
@@ -38,7 +38,8 @@ void us428_lights::init_us428_lights()
 
 void Cus428State::InitDevice(void)
 {
-       SliderChangedTo(eFaderM, ((unsigned char*)(us428ctls_sharedmem->CtlSnapShot + us428ctls_sharedmem->CtlSnapShotLast))[eFaderM]);
+       if (us428ctls_sharedmem->CtlSnapShotLast >= 0)
+               SliderChangedTo(eFaderM, ((unsigned char*)(us428ctls_sharedmem->CtlSnapShot + us428ctls_sharedmem->CtlSnapShotLast))[eFaderM]);
 }
 
 

diff --git a/us428control/Cus428_ctls.cc b/us428control/Cus428_ctls.cc
index 5f6d24e3882b20c2f859c219bf19c59d57e5abbb..f0b13e23615e9dc3b02b1e7d8ce668342979760b 100644 (file)
--- a/us428control/Cus428_ctls.cc
+++ b/us428control/Cus428_ctls.cc
@@ -36,26 +36,29 @@ Cus428_ctls::dump(int n)
 }
 
 void 
-Cus428_ctls::analyse(Cus428_ctls& Previous, unsigned n)
+Cus428_ctls::analyse(Cus428_ctls *Previous, unsigned n)
 {
+       Cus428_ctls *PreviousL = Previous ? Previous : new Cus428_ctls();
        OneState->Set_us428_ctls(this);
        for (; n < 9; n++) {                    //Sliders
-               char Diff = ((unsigned char*)this)[n] - ((unsigned char*)&Previous)[n];
+               char Diff = DiffValAt(PreviousL, n);
                if (Diff)
-                       OneState->SliderChangedTo(n, ((unsigned char*)this)[n]);                
+                       OneState->SliderChangedTo(n, ValAt(n));         
        }
        for (; n < 16; n++) {                   //Knobs
-               unsigned char Diff = ((unsigned char*)this)[n] ^ ((unsigned char*)&Previous)[n];
+               unsigned char Diff = DiffBitAt(PreviousL, n);
                unsigned o = 0;
                while (o < 8) {
                        if (Diff & (1 << o))
-                               OneState->KnobChangedTo((Cus428State::eKnobs)(8*n + o), ((unsigned char*)this)[n] & (1 << o));
+                               OneState->KnobChangedTo((Cus428State::eKnobs)(8*n + o), ValAt(n) & (1 << o));
                        ++o;
                }
        }
        for (; n < sizeof(*this); n++) {        //wheels
-               char Diff = ((unsigned char*)this)[ n] - ((unsigned char*)&Previous)[n];
+               char Diff = DiffValAt(PreviousL, n);
                if (Diff)
                        OneState->WheelChangedTo((E_In84)n, Diff);                              
-       }       
+       }
+       if (0 == Previous)
+               delete PreviousL;
 }

diff --git a/us428control/Cus428_ctls.h b/us428control/Cus428_ctls.h
index db5a28416a55fb2770989920e8a68de8ac2e98d1..1d5eb4064387f6a6bbd54edaa8df397ba9769205 100644 (file)
--- a/us428control/Cus428_ctls.h
+++ b/us428control/Cus428_ctls.h
@@ -25,11 +25,24 @@
 
 class Cus428_ctls: public us428_ctls{
  public:
+       Cus428_ctls() {
+               memset(this, 0, sizeof(*this));
+       }
        void dump(int n = 0);
-       void analyse(Cus428_ctls& Previous, unsigned n = 0);
+       void analyse(Cus428_ctls *Previous, unsigned n = 0);
        bool Knob( int K) {
                return ((char*)this)[K / 8] & (1 << K % 8);
        }
+ protected:
+       unsigned char ValAt(int i) {
+               return ((unsigned char*)this)[i];
+       }
+       unsigned char DiffValAt(Cus428_ctls *Other, int i) {
+               return ValAt(i) - Other->ValAt(i);
+       }
+       unsigned char DiffBitAt(Cus428_ctls *Other, int i) {
+               return ValAt(i) ^ Other->ValAt(i);
+       }
 };
 
 #endif

diff --git a/us428control/configure.in b/us428control/configure.in
index b6a594caf571755fb8a6cedabe24e05b3c5a48f7..628bd2025fc7cf69a6a4a1401b3017d7cad403c3 100644 (file)
--- a/us428control/configure.in
+++ b/us428control/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(us428control.cc)
-AM_INIT_AUTOMAKE(us428control, 0.4)
+AM_INIT_AUTOMAKE(us428control, 0.4.1)
 AC_PROG_CXX
 AC_PROG_INSTALL
 AC_HEADER_STDC

diff --git a/us428control/us428control.cc b/us428control/us428control.cc
index a9707851f1cebe3f937d45f33538a9e9caf38b37..28b856f8ab77b3402dd9b7ae0630bdbf748f88b2 100644 (file)
--- a/us428control/us428control.cc
+++ b/us428control/us428control.cc
@@ -121,14 +121,16 @@ int US428Control(const char* DevName)
                if (verbose > 1)
                        printf("Last is %i\n", Last);
                while (us428ctls_sharedmem->CtlSnapShotRed != Last) {
+                       static Cus428_ctls *Red = 0;
                        int Read = us428ctls_sharedmem->CtlSnapShotRed + 1;
-                       if (Read >= N_us428_ctl_BUFS)
+                       if (Read >= N_us428_ctl_BUFS || Read < 0)
                                Read = 0;
                        Cus428_ctls* PCtlSnapShot = ((Cus428_ctls*)(us428ctls_sharedmem->CtlSnapShot)) + Read;
                        int DiffAt = us428ctls_sharedmem->CtlSnapShotDiffersAt[Read];
                        if (verbose > 1)
                                PCtlSnapShot->dump(DiffAt);
-                       PCtlSnapShot->analyse(((Cus428_ctls*)(us428ctls_sharedmem->CtlSnapShot))[us428ctls_sharedmem->CtlSnapShotRed], DiffAt );
+                       PCtlSnapShot->analyse(Red, DiffAt);
+                       Red = PCtlSnapShot;
                        us428ctls_sharedmem->CtlSnapShotRed = Read;
                }
        }