Fixed strcmp(): Passing null to parameter #1 ($string1) of type strin… (OpenMage#4212)

kiatng · sreichel · web-flow · commit 4ddd7fb0c3b1 · 2024-09-23T07:52:14.000+02:00
* Fixed strcmp(): Passing null to parameter #1 ($string1) of type string is deprecated * Update app/code/core/Mage/Customer/controllers/AccountController.php Co-authored-by: Sven Reichel <github-sr@hotmail.com> * Update app/code/core/Mage/Customer/controllers/AccountController.php Fixed typo --------- Co-authored-by: Sven Reichel <github-sr@hotmail.com>
diff --git a/app/code/core/Mage/Customer/controllers/AccountController.php b/app/code/core/Mage/Customer/controllers/AccountController.php
@@ -932,7 +932,7 @@ protected function _validateResetPasswordLinkToken($customerId, $resetPasswordLi
         }
 
         $customerToken = $customer->getRpToken();
-        if (strcmp($customerToken, $resetPasswordLinkToken) != 0 || $customer->isResetPasswordLinkTokenExpired()) {
+        if (is_null($customerToken) || strcmp($customerToken, $resetPasswordLinkToken) !== 0 || $customer->isResetPasswordLinkTokenExpired()) {
             throw Mage::exception('Mage_Core', $this->_getHelper('customer')->__('Your password reset link has expired.'));
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -932,7 +932,7 @@ protected function _validateResetPasswordLinkToken($customerId, $resetPasswordLi`
`932`	`932`	`}`
`933`	`933`
`934`	`934`	`$customerToken = $customer->getRpToken();`
`935`		`- if (strcmp($customerToken, $resetPasswordLinkToken) != 0 \|\| $customer->isResetPasswordLinkTokenExpired()) {`
	`935`	`+ if (is_null($customerToken) \|\| strcmp($customerToken, $resetPasswordLinkToken) !== 0 \|\| $customer->isResetPasswordLinkTokenExpired()) {`
`936`	`936`	`throw Mage::exception('Mage_Core', $this->_getHelper('customer')->__('Your password reset link has expired.'));`
`937`	`937`	`}`
`938`	`938`	`}`