svn commit: r349434 - stable/12/usr.sbin/bhyve

[Mark Johnston]

Author: markj
Date: Wed Jun 26 17:41:38 2019
New Revision: 349434
URL: https://svnweb.freebsd.org/changeset/base/349434

Log:
  MFC r349196:
  Make zlib encoding messages idempotent.
  
  PR:	238333

Modified:
  stable/12/usr.sbin/bhyve/rfb.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.sbin/bhyve/rfb.c
==============================================================================
--- stable/12/usr.sbin/bhyve/rfb.c	Wed Jun 26 17:38:38 2019	(r349433)
+++ stable/12/usr.sbin/bhyve/rfb.c	Wed Jun 26 17:41:38 2019	(r349434)
@@ -270,8 +270,10 @@ rfb_recv_set_encodings_msg(struct rfb_softc *rc, int c
 			rc->enc_raw_ok = true;
 			break;
 		case RFB_ENCODING_ZLIB:
-			rc->enc_zlib_ok = true;
-			deflateInit(&rc->zstream, Z_BEST_SPEED);
+			if (!rc->enc_zlib_ok) {
+				deflateInit(&rc->zstream, Z_BEST_SPEED);
+				rc->enc_zlib_ok = true;
+			}
 			break;
 		case RFB_ENCODING_RESIZE:
 			rc->enc_resize_ok = true;