From 147509276256086d2087f04b15c014349d02d0dd Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 13 Jun 2019 14:23:02 +0200
Subject: [PATCH] Avoid nesting stream macros

It only works by luck here, so avoid this style as bugs easily happen.
---
 channels.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/channels.c b/channels.c
index e51f1cc..784ad46 100644
--- a/channels.c
+++ b/channels.c
@@ -186,6 +186,7 @@ void
 channel_process(STREAM s, uint16 mcs_channel)
 {
 	uint32 length, flags;
+	uint32 thislength;
 	VCHANNEL *channel = NULL;
 	unsigned int i;
 	STREAM in;
@@ -217,7 +218,8 @@ channel_process(STREAM s, uint16 mcs_channel)
 			s_reset(in);
 		}
 
-		out_uint8stream(in, s, s_remaining(s));
+		thislength = s_remaining(s);
+		out_uint8stream(in, s, thislength);
 
 		if (flags & CHANNEL_FLAG_LAST)
 		{