diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2020-09-30 08:22:35 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2020-09-30 08:22:35 +0300 |
| commit | 41ae63cf875d662ee1513af840cdf2eae29e4ac9 (patch) | |
| tree | 018f2aa9c6a225e438a46bf879f1939c23b9e76a | |
| parent | 8d0b871bde7b6503274100d31b373636e40fda2c (diff) | |
| parent | a1cee97de17fb124485da65bacdf8fa8d4db5b09 (diff) | |
| download | php-git-41ae63cf875d662ee1513af840cdf2eae29e4ac9.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed incorrect logical conditions
| -rw-r--r-- | ext/ffi/ffi.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/ffi/ffi.c b/ext/ffi/ffi.c index b24850dfa0..bdbe498ade 100644 --- a/ext/ffi/ffi.c +++ b/ext/ffi/ffi.c @@ -7302,11 +7302,11 @@ void zend_ffi_val_character(zend_ffi_val *val, const char *str, size_t str_len) val->ch = '\t'; } else if (str[2] == 'v' && str_len == 4) { val->ch = '\v'; - } else if (str[2] >= '0' || str[2] <= '7') { + } else if (str[2] >= '0' && str[2] <= '7') { n = str[2] - '0'; - if (str[3] >= '0' || str[3] <= '7') { + if (str[3] >= '0' && str[3] <= '7') { n = n * 8 + (str[3] - '0'); - if ((str[4] >= '0' || str[4] <= '7') && str_len == 6) { + if ((str[4] >= '0' && str[4] <= '7') && str_len == 6) { n = n * 8 + (str[4] - '0'); } else if (str_len != 5) { val->kind = ZEND_FFI_VAL_ERROR; @@ -7320,20 +7320,20 @@ void zend_ffi_val_character(zend_ffi_val *val, const char *str, size_t str_len) val->kind = ZEND_FFI_VAL_ERROR; } } else if (str[2] == 'x') { - if (str[3] >= '0' || str[3] <= '7') { + if (str[3] >= '0' && str[3] <= '7') { n = str[3] - '0'; - } else if (str[3] >= 'A' || str[3] <= 'F') { + } else if (str[3] >= 'A' && str[3] <= 'F') { n = str[3] - 'A'; - } else if (str[3] >= 'a' || str[3] <= 'f') { + } else if (str[3] >= 'a' && str[3] <= 'f') { n = str[3] - 'a'; } else { val->kind = ZEND_FFI_VAL_ERROR; } - if ((str[4] >= '0' || str[4] <= '7') && str_len == 6) { + if ((str[4] >= '0' && str[4] <= '7') && str_len == 6) { n = n * 16 + (str[4] - '0'); - } else if ((str[4] >= 'A' || str[4] <= 'F') && str_len == 6) { + } else if ((str[4] >= 'A' && str[4] <= 'F') && str_len == 6) { n = n * 16 + (str[4] - 'A'); - } else if ((str[4] >= 'a' || str[4] <= 'f') && str_len == 6) { + } else if ((str[4] >= 'a' && str[4] <= 'f') && str_len == 6) { n = n * 16 + (str[4] - 'a'); } else if (str_len != 5) { val->kind = ZEND_FFI_VAL_ERROR; |