Resolve memory exceptions

Author: pschatzmann

src/CommonHelix.h

@@ -5,6 +5,9 @@
 #ifndef HELIX_LOGGING_ACTIVE
 #define HELIX_LOGGING_ACTIVE true
 #endif
+#ifndef HELIX_LOG_LEVEL
+#define HELIX_LOG_LEVEL Info
+#endif
 
 #define SYNCH_WORD_LEN 4
 
@@ -80,7 +83,7 @@ class CommonHelix   {
             }
             memset(frame_buffer,0, maxFrameSize()+1);
             memset(pwm_buffer,0, maxPWMSize());
-            pwm_buffer[maxPWMSize()+1]=-1;
+            pwm_buffer[maxPWMSize()]=-1;
             active = true;
         }
 
@@ -156,15 +159,10 @@ class CommonHelix   {
 
         /// we add the data to the buffer until it is full
         size_t appendToBuffer(const void *in_ptr, int in_size){
-            LOG(Debug, "appendToBuffer: %d", in_size);
-            checkMemory();
+            LOG(Info, "appendToBuffer: %d (at %p)", in_size, frame_buffer);
             int buffer_size_old = buffer_size;
             int process_size = min((int)(maxFrameSize() - buffer_size), in_size);
-            assert(in_size>=0);
-            assert(in_size>=0);
-            assert(buffer_size>=0);
-            memmove(frame_buffer+buffer_size_old, in_ptr, process_size);
-            checkMemory();
+            memmove(frame_buffer+buffer_size, in_ptr, process_size); 
             buffer_size += process_size;
             LOG(Debug, "appendToBuffer %d + %d  -> %u", buffer_size_old,  process_size, buffer_size );
             return process_size;
@@ -205,7 +203,6 @@ class CommonHelix   {
                 memmove(frame_buffer, frame_buffer + range.start, buffer_size);
                 range.end -= range.start;
                 range.start = 0;
-                checkMemory();
                 LOG(Debug, "-> we are at beginning of synch word");
             } else if (range.start==0) {
                 LOG(Debug, "-> we are at beginning of synch word");
@@ -226,13 +223,9 @@ class CommonHelix   {
             return result;
         }
 
-        virtual void checkMemory(){
-        }
-
         void advanceFrameBuffer(int offset){
             buffer_size -= offset;
             memmove(frame_buffer, frame_buffer+offset, buffer_size);
-            checkMemory();
         }
 
 };

src/MP3DecoderHelix.h

@@ -108,12 +108,13 @@ class MP3DecoderHelix : public CommonHelix {
         void decode(Range r) {
             LOG(Debug, "decode %d", r.end);
             int len = r.end;
-            int bytesLeft =  r.end; //r.end; //r.end; // buffer_size
-
-            int result = MP3Decode(decoder, &frame_buffer + r.start, &bytesLeft, pwm_buffer, mp3_type);
-            checkMemory();
+            int bytesLeft =  r.end-r.start; //r.end; //r.end; // buffer_size
 
+            uint8_t* ptr = frame_buffer + r.start;
+            int result = MP3Decode(decoder, &ptr, &bytesLeft, pwm_buffer, mp3_type);
 
+            int decoded = len - bytesLeft;
+
             if (result==0){
                 int decoded = len - bytesLeft;
                 LOG(Debug, "-> bytesLeft %d -> %d  = %d ", buffer_size, bytesLeft, decoded);
@@ -127,44 +128,37 @@ class MP3DecoderHelix : public CommonHelix {
                 // remove processed data from buffer 
                 buffer_size -= decoded;
                 memmove(frame_buffer, frame_buffer+r.start+decoded, buffer_size);
-                checkMemory();
                 LOG(Debug, " -> decoded %d bytes - remaining buffer_size: %d", decoded, buffer_size);
             } else {
                 // decoding error
                 LOG(Debug, " -> decode error: %d - removing frame!", result);
+                int ignore = decoded;
+                if (ignore == 0) ignore = r.end;
                 // We advance to the next synch world
-                if (r.end>0){
-                    buffer_size -= r.end;
-                    memmove(frame_buffer, frame_buffer+r.end, buffer_size);
-                    checkMemory();
-                }
+                buffer_size -= ignore;
+                memmove(frame_buffer, frame_buffer+ignore, buffer_size);
             }
         }
 
         // return the resulting PWM data
         void provideResult(MP3FrameInfo &info){
             LOG(Debug, "=> provideResult: %d", info.outputSamps);
-
-            // provide result
-            if(pwmCallback!=nullptr){
-                // output via callback
-                pwmCallback(info, pwm_buffer, info.outputSamps);
-            } else {
-                // output to stream
-                if (info.samprate!=mp3FrameInfo.samprate  && infoCallback!=nullptr){
-                    infoCallback(mp3FrameInfo);
+            if (info.outputSamps>0){
+                // provide result
+                if(pwmCallback!=nullptr){
+                    // output via callback
+                    pwmCallback(info, pwm_buffer, info.outputSamps);
+                } else {
+                    // output to stream
+                    if (info.samprate!=mp3FrameInfo.samprate  && infoCallback!=nullptr){
+                        infoCallback(mp3FrameInfo);
+                    }
+                    out->write((uint8_t*)pwm_buffer, info.outputSamps);
                 }
-                out->write((uint8_t*)pwm_buffer, info.outputSamps);
+                mp3FrameInfo = info;
             }
-            mp3FrameInfo = info;
-            checkMemory();
         }
 
-        /// checks the consistency of the memory
-        virtual void checkMemory(){
-            //assert(frame_buffer[maxFrameSize()+1]==0);
-            //assert(pwm_buffer[maxPWMSize()+1]==-1);
-        }
 
 };