From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 17 Jun 2019 18:56:54 +0000 (+0200)
Subject: capmt: fix compilation with recent gcc, fixes #5657
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e555760895bab660fa6d998635e62535bb44cdf;p=thirdparty%2Ftvheadend.git

capmt: fix compilation with recent gcc, fixes #5657
---

diff --git a/src/descrambler/capmt.c b/src/descrambler/capmt.c
index f7db1eb9a..d8ab63bd3 100644
--- a/src/descrambler/capmt.c
+++ b/src/descrambler/capmt.c
@@ -1370,8 +1370,8 @@ capmt_analyze_cmd(capmt_t *capmt, uint32_t cmd, int adapter, sbuf_t *sb, int off
 
     uint16_t protover = sbuf_peek_u16(sb, offset);
     int offset2       = offset + 2;
-    char *info        = capmt_peek_str(sb, &offset2);
-    char *rev         = info ? strstr(info, "build r") : NULL;
+    char *info        = capmt_peek_str(sb, &offset2) ?: "<unknown>";
+    char *rev         = strstr(info, "build r");
 
     tvhinfo(LS_CAPMT, "%s: Connected to server '%s' (protocol version %d)", capmt_name(capmt), info, protover);
     if (rev)