changeset 54:7fd43d272c93 good64bit

Ahh .. yup.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 06 Aug 2013 15:57:30 +0300
parents a2f736d06b70
children 0b9b6739796b
files src/midifile.c
diffstat 1 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/midifile.c	Tue Aug 06 15:52:42 2013 +0300
+++ b/src/midifile.c	Tue Aug 06 15:57:30 2013 +0300
@@ -543,17 +543,15 @@
         }
         
         pMF->Track[i].pBase = pMF->curr;
-        pMF->Track[i].ptr = pMF->curr + 8;
-        
-        midiSkip(pMF, 4);
-        if (!midiGetBE32(pMF, &pMF->Track[i].sz))
+
+        if (!midiSkip(pMF, 4) ||
+            !midiGetBE32(pMF, &pMF->Track[i].sz))
         {
             midiError(pMF, "Could not read MTrk size.\n");
             goto error;
         }
 
-        midiSkip(pMF, 4);
-
+        pMF->Track[i].ptr = pMF->curr;
         pMF->Track[i].pEnd = pMF->curr + pMF->Track[i].sz;
 
         midiSkip(pMF, pMF->Track[i].sz);