From 52bfda48d5d9cdd02a49867118fb3e7ca1407fd6 Mon Sep 17 00:00:00 2001 From: Peter Stadler Date: Wed, 19 May 2021 10:38:44 +0200 Subject: [PATCH] nginx-util: do not use fallthrough attribute fixes issue #15653 Signed-off-by: Peter Stadler (cherry picked from commit 49a84e9b226c617929e3ad30aad27ab35712f096) --- net/nginx-util/Makefile | 2 +- net/nginx-util/src/nginx-ssl-util.hpp | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/net/nginx-util/Makefile b/net/nginx-util/Makefile index 54eb8bf876..b1d9c5e6fa 100644 --- a/net/nginx-util/Makefile +++ b/net/nginx-util/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nginx-util -PKG_VERSION:=1.5 +PKG_VERSION:=1.6 PKG_RELEASE:=1 PKG_MAINTAINER:=Peter Stadler diff --git a/net/nginx-util/src/nginx-ssl-util.hpp b/net/nginx-util/src/nginx-ssl-util.hpp index 4f12925db8..5a64b000a8 100644 --- a/net/nginx-util/src/nginx-ssl-util.hpp +++ b/net/nginx-util/src/nginx-ssl-util.hpp @@ -166,9 +166,14 @@ static constexpr auto _escape = _Line{ std::string ret{}; for (char c : strptr) { switch (c) { - case '^': ret += '\\'; [[fallthrough]]; - case '_': [[fallthrough]]; - case '-': ret += c; break; + case '^': + ret += '\\'; + ret += c; + break; + case '_': + case '-': + ret += c; + break; default: if ((isalpha(c) != 0) || (isdigit(c) != 0)) { ret += c;