bcdice 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2845b53edc8eaf447d222d1bd08a305dcaf8d38c7a9d6bd37539ed990713f533
-  data.tar.gz: 98bf76a14460707ec34952694e3e6256aabe6e66c187f1fd5394c816fb948df7
+  metadata.gz: af52626457e3a8d707ebba95dfad511c5cc8d84154ac4d141817b782be1a3f95
+  data.tar.gz: f567ff16168849b794537c88a6ac2568eebf3158086923c25262dc4fdee731e1
 SHA512:
-  metadata.gz: 5860f30cf937951291575caf5795878894926ee27692f49bf9b586e6d8d1cde3f3eec62e1181d7868dfb16cda93a0035869da89c5e89f89089450c2d515f46e4
-  data.tar.gz: 0723eb18505cc461a866feaf8f7a99e57c061be28acc716d7d6b0481eb7a7f1d8beb9ed9ec95196ac09593dac5ccfd052e05f7bc7957a69df0dd0748bd6e6c88
+  metadata.gz: a826afe976c398947e3a9e28ef7de6fa16f3b005137a4bad2c8ed98082f1b26916c4a250d0ebf374b9ff99557b542714df4edb2145fe7cec8f0b3684424c5a68
+  data.tar.gz: 476e0d4b6b0f7a6cfaf53c1e71fd19d0aaeea9f815e66fd1524f35e1e4f0c60e2066d0808abe7170c5e7c592f4c4fcc9d20385c28f32a8c7972eff8f7398da2c

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # ChangeLog
 
+## 3.1.3 2021/04/12
+
+### バグ修正
+- 悪意ある入力に対処 ([`c302300`](https://github.com/bcdice/BCDice/commit/c30230038b44b8d373e4a342b4cb4d528dc7c472))
+
 ## 3.1.2 2021/03/28
 
 ### バグ修正

data/lib/bcdice/game_system/LogHorizon.rb

@@ -244,7 +244,7 @@ module BCDice
 
       # 財宝表ロール
       def roll_treasure(command)
-        m = /^TRS(\d+)*([+\-\d]+)?$/.match(command)
+        m = /^TRS(\d+)?([+\-\d]+)?$/.match(command)
         return nil unless m
 
         character_rank = m[1].to_i
@@ -261,7 +261,7 @@ module BCDice
 
       ### 財宝表 ###
       def roll_treasure_table(command)
-        m = /^([CMIHG]TRS)(\d+)*([+\-\d]+)?(\$)?$/.match(command)
+        m = /^([CMIHG]TRS)(\d+)?([+\-\d]+)?(\$)?$/.match(command)
         return nil unless m
 
         type = m[1]
@@ -286,7 +286,7 @@ module BCDice
 
       # 拡張ルール財宝表
       def roll_treasure_table_b2(command)
-        m = /^([CMIO]TRSE)(\d+)*([+\-\d]+)?(\$)?$/.match(command)
+        m = /^([CMIO]TRSE)(\d+)?([+\-\d]+)?(\$)?$/.match(command)
         return nil unless m
 
         type = m[1]

data/lib/bcdice/game_system/Paradiso.rb

@@ -25,7 +25,7 @@ module BCDice
         　例）DC4:【攻撃力】4でダメージチェック　DC5[20]:【攻撃力】5でダメージチェック、うち1つは20mm機銃　DC5[20,30]:【攻撃力】5でダメージチェック、うち1つは20mm機銃、うち1つは30mmガンポッド
       MESSAGETEXT
 
-      register_prefix('(\d+)*D20<=', '(\d+)*CP', 'RMT', 'TOT', 'EXT', 'SUT', 'DC(\d+)')
+      register_prefix('\d*D20<=', '\d*CP', 'RMT', 'TOT', 'EXT', 'SUT', 'DC(\d+)')
 
       def eval_game_system_specific_command(command) # ダイスロールコマンド
         # 通常判定部分をgetJudgeResultコマンドに切り分け
@@ -53,13 +53,13 @@ module BCDice
       # 通常判定
       def getJudgeResult(command)
         case command
-        when /^(\d+)*D20<=(\d+)?(\[(\d+)(,(\d+))?\])?(@(\d+))?$/i
+        when /^(\d+)?D20<=(\d+)?(\[(\d+)(,(\d+))?\])?(@(\d+))?$/i
           number = (Regexp.last_match(1) || 1).to_i # ダイス数。省略時は1
           target = (Regexp.last_match(2) || 14).to_i # 目標値。省略時は14  if 空白 then 14 else 記載の値
           fumble1 = (Regexp.last_match(4) || 21).to_i # 追加ファンブル値。省略時は21
           fumble2 = (Regexp.last_match(6) || 21).to_i # 追加ファンブル値。省略時は21
           critical = (Regexp.last_match(8) || 21).to_i # 追加クリティカル値。省略時は21
-        when /^(\d+)*CP(\d+)?(\[(\d+)(,(\d+))?\])?(@(\d+))?$/i
+        when /^(\d+)?CP(\d+)?(\[(\d+)(,(\d+))?\])?(@(\d+))?$/i
           number = (Regexp.last_match(1) || 1).to_i
           target = (Regexp.last_match(2) || 14).to_i
           fumble1 = (Regexp.last_match(4) || 21).to_i

data/lib/bcdice/game_system/SterileLife.rb

@@ -37,8 +37,7 @@ module BCDice
         　・超未来の宇宙船内　INT
       MESSAGETEXT
 
-      register_prefix('(\d+)*DA.*\[(\d+),(\d+)(,(\d+))?\]', 'VPFT', 'VNFT', 'VNRT', 'AAFT', 'AST', 'RNST', 'RET', 'TRST', 'TRAT', 'TRMT', 'TROT', 'TET', 'ENT', 'CUT', 'NAT', 'INT') # '(\d+)*DA.*\[.*\]'
-
+      register_prefix('\d*DA.*\[(\d+),(\d+)(,(\d+))?\]', 'VPFT', 'VNFT', 'VNRT', 'AAFT', 'AST', 'RNST', 'RET', 'TRST', 'TRAT', 'TRMT', 'TROT', 'TET', 'ENT', 'CUT', 'NAT', 'INT')
       def eval_game_system_specific_command(command) # ダイスロールコマンド
         # 通常判定部分をgetJudgeResultコマンドに切り分け
         output = getJudgeResult(command)
@@ -104,7 +103,7 @@ module BCDice
 
       def getJudgeResult(command)
         case command
-        when /(\d+)*DA([\d+*\-]*\d)?\[(\d+),(\d+)(,(\d+))?\]/i
+        when /(\d+)?DA([\d+*\-]*\d)?\[(\d+),(\d+)(,(\d+))?\]/i
           number = (Regexp.last_match(1) || 1).to_i
           correction = (Regexp.last_match(2) || 0).to_i
           single = (Regexp.last_match(3) || 4).to_i

data/lib/bcdice/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BCDice
-  VERSION = "3.1.2"
+  VERSION = "3.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcdice
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - SAKATA Sinji
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-28 00:00:00.000000000 Z
+date: 2021-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n