Some more hardening

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
old mode 100755 (executable)
new mode 100644 (file)
index c7e2329..bfb88bc
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -1006,14 +1006,15 @@ OC.Uploader.prototype = _.extend({
                                                bufferTotal = bufferTotal - (buffer[bufferIndex]) + remainingSeconds;
                                                buffer[bufferIndex] = remainingSeconds; //buffer to make it smoother
                                                bufferIndex = (bufferIndex + 1) % bufferSize;
-                                               bufferIndex2 = bufferIndex2++;
+                                               bufferIndex2++;
                                        }
                                        var smoothRemainingSeconds;
-                                       if(bufferIndex2<20) {
-                                                       smoothRemainingSeconds = bufferTotal / bufferIndex2;
-                                       }
-                                       else {
-                                                smoothRemainingSeconds = bufferTotal / bufferSize; 
+                                       if (bufferIndex2 > 0 && bufferIndex2 < 20) {
+                                               smoothRemainingSeconds = bufferTotal / bufferIndex2;
+                                       } else if (bufferSize > 0) {
+                                               smoothRemainingSeconds = bufferTotal / bufferSize;
+                                       } else {
+                                               smoothRemainingSeconds = 1;
                                        }
 
                                        var h = moment.duration(smoothRemainingSeconds, "seconds").humanize();