commit 9ed3baf0040952c17531271a7259c0fa4919cb1d
author James Muehlner <james.muehlner@guac-dev.org> Tue Feb 06 21:30:30 2018 -0800
committer James Muehlner <james.muehlner@guac-dev.org> Tue Feb 06 21:30:30 2018 -0800
tree 1de8786b06260778de369a5ce5803a2231ee945f
parent 1cf86e12a1572531d425f70eed1cec1a45b5331b
parent 19b5050fbf6a61910ca145089042800211b93210

GUACAMOLE-482: Merge encoding error handling improvements.

src/guacenc/encode.c

diff --git a/src/guacenc/encode.c b/src/guacenc/encode.c
index 854c5c6..2d74a9b 100644
--- a/src/guacenc/encode.c
+++ b/src/guacenc/encode.c
@@ -63,8 +63,11 @@
 
     /* Continuously read and handle all instructions */
     while (!guac_parser_read(parser, socket, -1)) {
-        guacenc_handle_instruction(display, parser->opcode,
-                parser->argc, parser->argv);
+        if (guacenc_handle_instruction(display, parser->opcode,
+                parser->argc, parser->argv)) {
+            guac_parser_free(parser);
+            return 1;
+        }
     }
 
     /* Fail on read/parse error */

src/guacenc/video.c

diff --git a/src/guacenc/video.c b/src/guacenc/video.c
index 4ca84f6..4592a2b 100644
--- a/src/guacenc/video.c
+++ b/src/guacenc/video.c
@@ -228,7 +228,11 @@
 
         /* Flush frames to bring timeline in sync, duplicating if necessary */
         do {
-            guacenc_video_flush_frame(video);
+            if (guacenc_video_flush_frame(video)) {
+                guacenc_log(GUAC_LOG_ERROR, "Unable to flush frame to video "
+                        "stream.");
+                return 1;
+            }
         } while (--elapsed != 0);
 
     }