Oops when player thread keeps reading input unsuccessfully

Reading input fails after EOF and while the current command is
aborted.  Commands should detect that and fail.  If a command neglects
to do that in a loop, the loop can become infinite.  This is
especially bad after EOF, because then the client might not read
output anymore.  Output gets buffered until memory runs out.

Mitigate such bugs by counting how many calls have failed in a row,
oopsing on the 256th, and sleeping one minute from the 256th on.
(cherry picked from commit 49c24d7b78d728f84ab4932572914aab71ddbc1e)

diff --git a/include/player.h b/include/player.h
index 584c613f6dd51fdc7b461e18e53da412b2b3714d..52edb3364362c471023beb5a79a76bff3d6e2f70 100644 (file)
--- a/include/player.h
+++ b/include/player.h
@@ -78,6 +78,7 @@ struct player {
     time_t curup;              /* when last input was received */
     int aborted;               /* interrupt cookie received? */
     int eof;                   /* EOF (cookie or real) received? */
+    int recvfail;              /* #recvclient() failures */
     int curid;                 /* for pr, cur. line's id, -1 none */
     char *map;                 /* pointer to in-mem map */
     char *bmap;                        /* pointer to in-mem bmap */

diff --git a/src/lib/player/recvclient.c b/src/lib/player/recvclient.c
index 169a1424ca9ef7ecf841291da332cb41c1957ca5..5757aa40664ccef6c34934667a8b2bce3185a17d 100644 (file)
--- a/src/lib/player/recvclient.c
+++ b/src/lib/player/recvclient.c
@@ -90,10 +90,19 @@ recvclient(char *cmd, int size)
            player->eof = 1;
     }
 
-    if (player->eof)
-       return -1;
-    if (player->aborted)
-       return -2;
+    if (player->aborted || player->eof) {
+       player->recvfail++;
+       if (player->recvfail > 255) {
+           /*
+            * Looks like the thread is stuck in a loop that fails to
+            * check errors; oops once, then slow it down drastically.
+            */
+           CANT_HAPPEN(player->recvfail == 256);
+           empth_sleep(time(NULL) + 60);
+       }
+       return player->eof ? -1 : -2;
+    }
 
+    player->recvfail = 0;
     return count;
 }