libddwaf 1.18.0.0.0-aarch64-linux → 1.18.0.0.1-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 298db1439c732615e53a869f94148600b60f8fc49dfbab3b58f2716a74fb2676
-  data.tar.gz: 33e8b8c21b1b14e348c9893a56b937156012d50aa342d2fb38a8b9cb4fa27745
+  metadata.gz: b3abf187770006451e7f8ce53fdeb69058ac598fbcea533e93689c971bfef845
+  data.tar.gz: 0ca648d5bb5a8098129ea5cc215df0ea3f1fd89fc20c7324fde75abc6b1b275a
 SHA512:
-  metadata.gz: 87424ba2eed4ee4bed3465126960bec4aae191d96e2478f2b94016853fa45ed1185bc28db2b843fa4605e7ed197a0ebc2afb7ccae695df3a10104ddede84204e
-  data.tar.gz: 428ff1cdaa605e4798eccaa2acd1c14d1abc0575cf2bed9d56e7b1013f9ce2efcd8bef973882eb35ac56191cc65dd957f4685513573bb08f47d7e56bad879d35
+  metadata.gz: acec5f10b591e71c7fd3eb258eb55fc62b74ef6ff8840f1803dee0204a5fc89506fb243cfab254f4b1d86eb581b9b8238761b5d2ffc92fd34cc3f2219871640c
+  data.tar.gz: c445b7ab209b985dcb8a62854349afaef5de45fc04a28723ffe33363c16961d0d69d9dccc6d9da75cb8664e84a806346706a3e7e6b417a8971367649dc713759

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: aarch64-linux
 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