# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1490799429 -3600
# Node ID 549e2f97a4018ad0fa90675f5ca19e1421da72c1
# Parent  f8d4f2c514d8524f1c9874b36b361a161d1279d3# Parent  0b1c48849b4fbffb6f438d5567168980af0ad76f
Merge branch 'master' into vnext

# Conflicts:
#	js/loudness.js

diff -r f8d4f2c514d8 -r 549e2f97a401 js/loudness.js
--- a/js/loudness.js	Wed Mar 29 15:53:15 2017 +0100
+++ b/js/loudness.js	Wed Mar 29 15:57:09 2017 +0100
@@ -89,7 +89,11 @@
         for (var no = 0; no < num_frames; no++) {
             MS[c][no] = 0.0;
             for (var ptr = 0; ptr < frame_size; ptr++) {
-                var sample = data[no * step_size + ptr];
+                var i = no * step_size + ptr;
+                if (i >= buffer.length) {
+                    break;
+                }
+                var sample = data[i];
                 MS[c][no] += sample * sample;
             }
             MS[c][no] /= frame_size;