Check to see if a timeout is expected

When a timeout keycode is received, make sure that it is expected,
otherwise a non-existent timeout routine may be called.

diff --git a/src/common/stream.c b/src/common/stream.c
index ce2ed5ca56f51e8958118c599092cd061fbcfd70..7bfffe123aff059fb8031d4a40ceb119b40a59f0 100644 (file)
--- a/src/common/stream.c
+++ b/src/common/stream.c
@@ -255,9 +255,18 @@ continue_input:
 
     /* Handle timeouts */
 
-    if (key == ZC_TIME_OUT)
-       if (direct_call (routine) == 0)
-           goto continue_input;
+    /*
+     * Make sure that this is a real timeout, by checking
+     * that the requested timeout is not zero.  For the case
+     * of a recorded stream, it is possible that a timeout
+     * keystroke might be replayed.
+     */
+    if (timeout != 0)
+    {
+       if (key == ZC_TIME_OUT)
+           if (direct_call (routine) == 0)
+               goto continue_input;
+    }
 
     /* Handle hot keys */
 
@@ -327,9 +336,18 @@ continue_input:
 
     /* Handle timeouts */
 
-    if (key == ZC_TIME_OUT)
-       if (direct_call (routine) == 0)
-           goto continue_input;
+    /*
+     * Make sure that this is a real timeout, by checking
+     * that the requested timeout is not zero.  For the case
+     * of a recorded stream, it is possible that a timeout
+     * keystroke might be replayed.
+     */
+    if (timeout != 0)
+    {
+       if (key == ZC_TIME_OUT)
+           if (direct_call (routine) == 0)
+               goto continue_input;
+    }
 
     /* Handle hot keys */