From a9650e1ff40b7a131c378f0428b3be7f7d690f53 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Tue, 15 Sep 2026 13:10:04 -0400 Subject: [PATCH] MT#55283 fix nested string lookup booboo closes #2172 Change-Id: I8d9e85e1726220efbd9e05d96d0c9b4e72a251a1 --- lib/.ycm_extra_conf.py | 7 ++++++- lib/opus.c | 16 ++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/lib/.ycm_extra_conf.py b/lib/.ycm_extra_conf.py index a142e0a8f..76fec0fca 100644 --- a/lib/.ycm_extra_conf.py +++ b/lib/.ycm_extra_conf.py @@ -46,8 +46,13 @@ flags = [ '-DHAVE_CODEC_CHAIN', '-DHAVE_LIBURING', '-D__csh_lookup(x)=str_hash(x)', + '-D__csh_lookup_n(n,x)=__csh_lookup(x)', + '-D__csh_lookup_section(n,x)=__csh_lookup(x)', '-DCSH_LOOKUP(x)=' + csh_lookup_str, - '-O2', + '-DCSH_LOOKUP_N(n,x)=CSH_LOOKUP(x)', + '-DCSH_SECTION=0', + '-DCSH_NUM_LOOKUPS=0', + '-O2', '-fstack-protector', '--param=ssp-buffer-size=4', '-Wformat', diff --git a/lib/opus.c b/lib/opus.c index 42a31d3d6..e22048bbb 100644 --- a/lib/opus.c +++ b/lib/opus.c @@ -120,18 +120,18 @@ static void libopus_set_enc_opts(str *key, str *val, void *p) { opts->complexity = str_to_i(val, -1); break; case CSH_LOOKUP("application"): - switch (__csh_lookup(val)) { - case CSH_LOOKUP("VOIP"): - case CSH_LOOKUP("VoIP"): - case CSH_LOOKUP("voip"): + switch (__csh_lookup_n(1, val)) { + case CSH_LOOKUP_N(1, "VOIP"): + case CSH_LOOKUP_N(1, "VoIP"): + case CSH_LOOKUP_N(1, "voip"): opts->application = OPUS_APPLICATION_VOIP; break; - case CSH_LOOKUP("audio"): + case CSH_LOOKUP_N(1, "audio"): opts->application = OPUS_APPLICATION_AUDIO; break; - case CSH_LOOKUP("low-delay"): - case CSH_LOOKUP("low delay"): - case CSH_LOOKUP("lowdelay"): + case CSH_LOOKUP_N(1, "low-delay"): + case CSH_LOOKUP_N(1, "low delay"): + case CSH_LOOKUP_N(1, "lowdelay"): opts->application = OPUS_APPLICATION_RESTRICTED_LOWDELAY; break; default: