one_gadget 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 698ac48e3e7980de7f6c1b5b8bb4085a0466702cd80a427c33612191b6bda47c
-  data.tar.gz: 55bad01393fc60e1872becf2f0b3e9d2b92a5269683428617f8fb09d1f3776a7
+  metadata.gz: 223aa849cee41952e27731d2ae1e0aeced46e45c9c902d88501a896443934486
+  data.tar.gz: 9f5a11874255fba6cfc3e9a344e2ebc1a15e7388bcff81ffc83e9859d1480fb7
 SHA512:
-  metadata.gz: 6069d1f1c95628d2fd5a30430ce5f3b80ddd6256a2df0d5a94bede26aa034c5e796cb0682496f94835d31b5c359f78dc42fc7e3c942305b3c3bc597d5a5c722f
-  data.tar.gz: 8d69884a81539655aa360af17a6c443f65985235e422a9ea45f2a693cf0dff4387436c4e4340d9160e73166dc686067a87c025a466d71623a86c9ba600895880
+  metadata.gz: 000f6fc6ae7e4e1d714b95fb2d958a40798dc867f991f74050cce746ba3edbc4ab5f41f00de973f4b6237c00f1a714ed6c0f895d5a89de667899da40a4b5d313
+  data.tar.gz: 6c2a1e22e24a3b9cfbdd0f166c4686894686c8805479fc4cfd152e2b5e37841e05178172b4121bdfbe187ec5378ed744955cd0ebeb898ac6d5aebc10889e9e59

data/lib/one_gadget/gadget.rb

@@ -78,12 +78,19 @@ module OneGadget
         case expr
         when / & 0xf/ then 0.95
         when /GOT address/ then 0.9
-        when /^writable/ then 0.81
-        when / == NULL$/ then calculate_null_score(expr.slice(0...expr.rindex(' == NULL')))
-        when / <= 0$/ then calculate_null_score(expr.slice(0...expr.rindex(' <= ')))
+        when /^writable/ then calculate_writable_score(expr.sub('writable: ', ''))
+        when / == NULL$/ then calculate_null_score(expr.sub(' == NULL', ''))
+        when / <= 0$/ then calculate_null_score(expr.sub(' <= 0', ''))
         end
       end
 
+      def calculate_writable_score(identity)
+        lmda = OneGadget::Emulators::Lambda.parse(identity)
+        return 0.81 if lmda.deref_count != 0
+
+        OneGadget::ABI.stack_register?(lmda.obj) ? 0.95 : 0.81
+      end
+
       def calculate_null_score(identity)
         # remove <CAST>
         identity.sub!(/^\([s|u]\d+\)/, '')

data/lib/one_gadget/version.rb

@@ -2,5 +2,5 @@
 
 module OneGadget
   # Current gem version.
-  VERSION = '1.8.0'
+  VERSION = '1.8.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: one_gadget
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - david942j
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-20 00:00:00.000000000 Z
+date: 2022-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elftools