libddwaf 1.18.0.0.0-x86_64-darwin → 1.18.0.0.1-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d698f36c04a2f93451be0473edac063b8c5f777813d046645ec967ef662e81b4
-  data.tar.gz: 0b1cf88a7a4857f5924dd40a7159e53211b57c1ce915c237dfe28e20e9cf1dbe
+  metadata.gz: 965b26cd427108cda8af74f97d15a7650986805c20ff4e29e3503e398345cefb
+  data.tar.gz: 8c14f98e586968d17e01c950bc3dd1d41170fc11785bcc850b12174afc30f67a
 SHA512:
-  metadata.gz: '086d24f3178b44c45484d75bc39b4b53a9b32b0f574d12a35f8c4b684cf0d1c81c7f3905fb2c804f0b93f3405cbe6161d9951723050b1dea929841d13d6e9844'
-  data.tar.gz: 3222b0bb8ea92b1ad842392dd4badcc1739a36b53247a5fbf4bff943d9c230e525586868747ec67007fa930e8c97a7213266cade60a37d157debabdf8758430e
+  metadata.gz: df7745982905f608b9a30e8bd3b22e70ba249124bf109a8c27f7c2f4e4e877f6dac7fbb93605e8ef97e8f784ebe5155826c18beb323985ffee3e1731354bdc64
+  data.tar.gz: 496a4f74eb28a009077504b6c9db8de04aecc1f2c323a57208751d9a7e77faac56a4a007c9716b4f089da0f113ec0d4e6ff545f22ecb46cd0857bfce062c63bf

data/CHANGELOG.md

@@ -1,8 +1,14 @@
+# 2025-02-20 v.1.18.0.0.1
+
+- Fixed memory-leak in `Datadog::AppSec::WAF::Context#run` when non-empty ephemeral data passed
+
 # 2024-10-29 v.1.15.0.0.0
+
 - Update to libddwaf 1.15.0
 - Changed `Datadog::AppSec::WAF::Context#run` interface to accommodate ephemeral data ([Breaking change](https://github.com/DataDog/libddwaf/blob/master/CHANGELOG.md#v1150-unstable))
 
 # 2023-09-11 v.1.14.0.0.0
+
 - Update to libddwaf 1.14.0
 - Add support for `Float` and `Nil` scalar values when converting from ruby to WAF Object and vice versa.
 

data/lib/datadog/appsec/waf/context.rb

@@ -35,6 +35,7 @@ module Datadog
             LibDDWAF.ddwaf_object_free(retained_obj)
           end
 
+          retained.clear
           LibDDWAF.ddwaf_context_destroy(context_obj)
         end
 
@@ -83,10 +84,13 @@ module Datadog
           [RESULT_CODE[code], result]
         ensure
           LibDDWAF.ddwaf_result_free(result_obj) if result_obj
+          LibDDWAF.ddwaf_object_free(ephemeral_data_obj) if ephemeral_data_obj
         end
 
         private
 
+        # FIXME: Rename into something which reflect that it's impossible to run
+        #        libddwaf on finalized context (closed)
         def validate!
           @valid = true
         end

data/lib/datadog/appsec/waf/lib_ddwaf.rb

@@ -53,7 +53,7 @@ module Datadog
 
             cpu = case os_arch
                   when 'amd64' then 'x86_64'
-                  when 'aarch64' then 'aarch64'
+                  when 'aarch64' then local_os == 'darwin' ? 'arm64' : 'aarch64'
                   else raise Error, "unsupported JRuby os.arch: #{os_arch.inspect}"
                   end
 
@@ -95,7 +95,13 @@ module Datadog
         end
 
         def self.shared_lib_extname
-          Gem::Platform.local.os == 'darwin' ? '.dylib' : '.so'
+          if Gem::Platform.local.os == 'darwin'
+            '.dylib'
+          elsif Gem::Platform.local.os == 'java' && java.lang.System.get_property('os.name').match(/mac/i)
+            '.dylib'
+          else
+            '.so'
+          end
         end
 
         def self.shared_lib_path

data/lib/datadog/appsec/waf/version.rb

@@ -3,7 +3,7 @@ module Datadog
     module WAF
       module VERSION
         BASE_STRING = '1.18.0'
-        STRING = "#{BASE_STRING}.0.0"
+        STRING = "#{BASE_STRING}.0.1"
         MINIMUM_RUBY_VERSION = '2.5'
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libddwaf
 version: !ruby/object:Gem::Version
-  version: 1.18.0.0.0
+  version: 1.18.0.0.1
 platform: x86_64-darwin
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-12 00:00:00.000000000 Z
+date: 2025-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.5.17
+rubygems_version: 3.5.21
 signing_key:
 specification_version: 4
 summary: Datadog WAF