Merge pull request #179 from jamieburchell/patch-1

judgej · web-flow · commit 292557420b52 · 2022-03-08T16:06:46.000Z
Fix preg_match search on NULL
diff --git a/src/Message/DirectAuthorizeRequest.php b/src/Message/DirectAuthorizeRequest.php
@@ -135,7 +135,7 @@ public function getClientIp()
         $ip = parent::getClientIp();
 
         // OmniPay core could do with a helper for this.
-        if (! preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $ip)) {
+        if (! is_null($ip) && ! preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $ip)) {
             $ip = null;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ public function getClientIp()`
`135`	`135`	`$ip = parent::getClientIp();`
`136`	`136`
`137`	`137`	`// OmniPay core could do with a helper for this.`
`138`		`- if (! preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $ip)) {`
	`138`	`+ if (! is_null($ip) && ! preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $ip)) {`
`139`	`139`	`$ip = null;`
`140`	`140`	`}`
`141`	`141`