--- libgig/trunk/src/gig.cpp	2008/02/10 16:07:22	1678
+++ libgig/trunk/src/gig.cpp	2009/07/29 08:57:46	1950
@@ -2,7 +2,7 @@
  *                                                                         *
  *   libgig - C++ cross-platform Gigasampler format file access library    *
  *                                                                         *
- *   Copyright (C) 2003-2007 by Christian Schoenebeck                      *
+ *   Copyright (C) 2003-2009 by Christian Schoenebeck                      *
  *                              <cuse@users.sourceforge.net>               *
  *                                                                         *
  *   This library is free software; you can redistribute it and/or modify  *
@@ -25,6 +25,7 @@
 
 #include "helper.h"
 
+#include <algorithm>
 #include <math.h>
 #include <iostream>
 
@@ -676,6 +677,7 @@
         if (SampleCount > this->SamplesTotal) SampleCount = this->SamplesTotal;
         if (RAMCache.pStart) delete[] (int8_t*) RAMCache.pStart;
         unsigned long allocationsize = (SampleCount + NullSamplesCount) * this->FrameSize;
+        SetPos(0); // reset read position to begin of sample
         RAMCache.pStart            = new int8_t[allocationsize];
         RAMCache.Size              = Read(RAMCache.pStart, SampleCount) * this->FrameSize;
         RAMCache.NullExtensionSize = allocationsize - RAMCache.Size;
@@ -713,6 +715,7 @@
         if (RAMCache.pStart) delete[] (int8_t*) RAMCache.pStart;
         RAMCache.pStart = NULL;
         RAMCache.Size   = 0;
+        RAMCache.NullExtensionSize = 0;
     }
 
     /** @brief Resize sample.
@@ -907,7 +910,8 @@
                                 }
 
                                 // reverse the sample frames for backward playback
-                                SwapMemoryArea(&pDst[swapareastart * this->FrameSize], (totalreadsamples - swapareastart) * this->FrameSize, this->FrameSize);
+                                if (totalreadsamples > swapareastart) //FIXME: this if() is just a crash workaround for now (#102), but totalreadsamples <= swapareastart should never be the case, so there's probably still a bug above!
+                                    SwapMemoryArea(&pDst[swapareastart * this->FrameSize], (totalreadsamples - swapareastart) * this->FrameSize, this->FrameSize);
                             }
                         } while (samplestoread && readsamples);
                         break;
@@ -1834,7 +1838,7 @@
 
         const uint16_t eg3depth = (EG3Depth >= 0) ? EG3Depth
                                                   : uint16_t(((-EG3Depth) - 1) ^ 0xffff); /* binary complementary for negatives */
-        pData[116] = eg3depth;
+        store16(&pData[116], eg3depth);
 
         // next 2 bytes unknown
 
@@ -3032,6 +3036,9 @@
     }
 
     Instrument::~Instrument() {
+        for (int i = 0 ; pMidiRules[i] ; i++) {
+            delete pMidiRules[i];
+        }
         delete[] pMidiRules;
     }