php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-07 16:13:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed incorrect logical conditions

Browse Source
This commit is contained in:
George Peter Banyard
2020-09-30 08:21:46 +03:00
committed by Dmitry Stogov
parent f20a2b4f3c
commit a1cee97de1
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ext/ffi/ffi.c
View File

@@ -7427,11 +7427,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;
@@ -7445,20 +7445,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;