Fixes after review

DataDog · Oct 4, 2024 · 2c3f99b · 2c3f99b
1 parent 708dbe4
commit 2c3f99b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/appsec/src/extension/ddappsec.c b/appsec/src/extension/ddappsec.c
@@ -402,13 +402,14 @@ __attribute__((visibility("default"))) void dd_appsec_rc_conf(
     bool prev_active = DDAPPSEC_G(active);
     bool prev_to_be_configured = DDAPPSEC_G(to_be_configured);
     _check_enabled();
-    DDAPPSEC_G(enabled) = prev_enabled;
-    DDAPPSEC_G(active) = prev_active;
-    DDAPPSEC_G(to_be_configured) = prev_to_be_configured;
 
     *appsec_features = DDAPPSEC_G(enabled) == APPSEC_ENABLED_VIA_REMCFG;
     // only enable ASM / ASM_DD / ASM_DATA if no rules file is specified
     *appsec_conf = get_global_DD_APPSEC_RULES()->len == 0;
+
+    DDAPPSEC_G(enabled) = prev_enabled;
+    DDAPPSEC_G(active) = prev_active;
+    DDAPPSEC_G(to_be_configured) = prev_to_be_configured;
 }
 
 static PHP_FUNCTION(datadog_appsec_is_enabled)

diff --git a/appsec/src/helper/main.cpp b/appsec/src/helper/main.cpp
@@ -1,5 +1,5 @@
-// dual-licensed under the Apache-2.0 License or BSD-3-Clause License.
 // Unless explicitly stated otherwise all files in this repository are
+// dual-licensed under the Apache-2.0 License or BSD-3-Clause License.
 //
 // This product includes software developed at Datadog
 // (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.

diff --git a/appsec/src/helper/remote_config/client.cpp b/appsec/src/helper/remote_config/client.cpp
@@ -87,7 +87,7 @@ client::client(remote_config::settings settings,
           ddog_remote_config_reader_drop},
       settings_{std::move(settings)}, listeners_{std::move(listeners)}
 {
-    assert(settings.enabled == true); // NOLINT
+    assert(settings_.enabled == true); // NOLINT
 
     for (auto const &listener : listeners_) {
         for (const product p : listener->get_supported_products()) {