From 4036e249c365b7840e2c5f9ce7e9b2edbecf3184 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 17 Jun 2019 20:56:54 +0200 Subject: [PATCH] capmt: fix compilation with recent gcc, fixes #5657 --- src/descrambler/capmt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/descrambler/capmt.c b/src/descrambler/capmt.c index 162a2193e..50cfd5831 100644 --- a/src/descrambler/capmt.c +++ b/src/descrambler/capmt.c @@ -1508,8 +1508,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) ?: ""; + char *rev = strstr(info, "build r"); tvhinfo(LS_CAPMT, "%s: Connected to server '%s' (protocol version %d)", capmt_name(capmt), info, protover); if (rev) -- 2.47.2