Skip to content

Commit a1cee97

Browse files
Girgiasdstogov
authored andcommitted
Fixed incorrect logical conditions
1 parent f20a2b4 commit a1cee97

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

ext/ffi/ffi.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7427,11 +7427,11 @@ void zend_ffi_val_character(zend_ffi_val *val, const char *str, size_t str_len)
74277427
val->ch = '\t';
74287428
} else if (str[2] == 'v' && str_len == 4) {
74297429
val->ch = '\v';
7430-
} else if (str[2] >= '0' || str[2] <= '7') {
7430+
} else if (str[2] >= '0' && str[2] <= '7') {
74317431
n = str[2] - '0';
7432-
if (str[3] >= '0' || str[3] <= '7') {
7432+
if (str[3] >= '0' && str[3] <= '7') {
74337433
n = n * 8 + (str[3] - '0');
7434-
if ((str[4] >= '0' || str[4] <= '7') && str_len == 6) {
7434+
if ((str[4] >= '0' && str[4] <= '7') && str_len == 6) {
74357435
n = n * 8 + (str[4] - '0');
74367436
} else if (str_len != 5) {
74377437
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)
74457445
val->kind = ZEND_FFI_VAL_ERROR;
74467446
}
74477447
} else if (str[2] == 'x') {
7448-
if (str[3] >= '0' || str[3] <= '7') {
7448+
if (str[3] >= '0' && str[3] <= '7') {
74497449
n = str[3] - '0';
7450-
} else if (str[3] >= 'A' || str[3] <= 'F') {
7450+
} else if (str[3] >= 'A' && str[3] <= 'F') {
74517451
n = str[3] - 'A';
7452-
} else if (str[3] >= 'a' || str[3] <= 'f') {
7452+
} else if (str[3] >= 'a' && str[3] <= 'f') {
74537453
n = str[3] - 'a';
74547454
} else {
74557455
val->kind = ZEND_FFI_VAL_ERROR;
74567456
}
7457-
if ((str[4] >= '0' || str[4] <= '7') && str_len == 6) {
7457+
if ((str[4] >= '0' && str[4] <= '7') && str_len == 6) {
74587458
n = n * 16 + (str[4] - '0');
7459-
} else if ((str[4] >= 'A' || str[4] <= 'F') && str_len == 6) {
7459+
} else if ((str[4] >= 'A' && str[4] <= 'F') && str_len == 6) {
74607460
n = n * 16 + (str[4] - 'A');
7461-
} else if ((str[4] >= 'a' || str[4] <= 'f') && str_len == 6) {
7461+
} else if ((str[4] >= 'a' && str[4] <= 'f') && str_len == 6) {
74627462
n = n * 16 + (str[4] - 'a');
74637463
} else if (str_len != 5) {
74647464
val->kind = ZEND_FFI_VAL_ERROR;

0 commit comments

Comments
 (0)