Fix an issue where it would terminate if it could not allocate an excessively large...

diff --git a/player.c b/player.c
index 4a563834d7b05aef2782dc96f977a12179cf745e..fe3bb3508e8f8f39e4678b8388ace145e34a0d55 100644 (file)
--- a/player.c
+++ b/player.c
@@ -1829,11 +1829,15 @@ static void *player_thread_func(void *arg) {
                 // debug(1, "Large positive sync error: %lld. Dropping the frame.", sync_error);
               } else if ((sync_error < 0) && ((-sync_error) > filler_length)) {
                 // debug(1, "Large negative sync error: %lld. Inserting silence.", sync_error);
-                char *long_silence = malloc(conn->output_bytes_per_frame * (-sync_error));
+                size_t silence_length = -sync_error;
+                if (silence_length>(filler_length*5))
+                  silence_length = filler_length*5;
+                  
+                char *long_silence = malloc(conn->output_bytes_per_frame * silence_length);
                 if (long_silence == NULL)
-                  die("Failed to allocate memory for a long_silence buffer.");
-                memset(long_silence, 0, conn->output_bytes_per_frame * (-sync_error));
-                config.output->play((short *)long_silence, (-sync_error));
+                  die("Failed to allocate memory for a long_silence buffer of %d frames.",silence_length);
+                memset(long_silence, 0, conn->output_bytes_per_frame * silence_length);
+                config.output->play((short *)long_silence, silence_length);
                 free(long_silence);
               }
             } else {