summaryrefslogtreecommitdiff
path: root/ext/standard/password.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/standard/password.c')
-rw-r--r--ext/standard/password.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/standard/password.c b/ext/standard/password.c
index 3f1ff6dd55..52ff1518e6 100644
--- a/ext/standard/password.c
+++ b/ext/standard/password.c
@@ -140,6 +140,9 @@ static zend_string* php_password_get_salt(zval *unused_, size_t required_salt_le
case IS_DOUBLE:
case IS_OBJECT:
buffer = zval_get_string(option_buffer);
+ if (EG(exception)) {
+ return NULL;
+ }
break;
case IS_FALSE:
case IS_TRUE: