@@ -7427,11 +7427,11 @@ void zend_ffi_val_character(zend_ffi_val *val, const char *str, size_t str_len)
7427
7427
val -> ch = '\t' ;
7428
7428
} else if (str [2 ] == 'v' && str_len == 4 ) {
7429
7429
val -> ch = '\v' ;
7430
- } else if (str [2 ] >= '0' || str [2 ] <= '7' ) {
7430
+ } else if (str [2 ] >= '0' && str [2 ] <= '7' ) {
7431
7431
n = str [2 ] - '0' ;
7432
- if (str [3 ] >= '0' || str [3 ] <= '7' ) {
7432
+ if (str [3 ] >= '0' && str [3 ] <= '7' ) {
7433
7433
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 ) {
7435
7435
n = n * 8 + (str [4 ] - '0' );
7436
7436
} else if (str_len != 5 ) {
7437
7437
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)
7445
7445
val -> kind = ZEND_FFI_VAL_ERROR ;
7446
7446
}
7447
7447
} else if (str [2 ] == 'x' ) {
7448
- if (str [3 ] >= '0' || str [3 ] <= '7' ) {
7448
+ if (str [3 ] >= '0' && str [3 ] <= '7' ) {
7449
7449
n = str [3 ] - '0' ;
7450
- } else if (str [3 ] >= 'A' || str [3 ] <= 'F' ) {
7450
+ } else if (str [3 ] >= 'A' && str [3 ] <= 'F' ) {
7451
7451
n = str [3 ] - 'A' ;
7452
- } else if (str [3 ] >= 'a' || str [3 ] <= 'f' ) {
7452
+ } else if (str [3 ] >= 'a' && str [3 ] <= 'f' ) {
7453
7453
n = str [3 ] - 'a' ;
7454
7454
} else {
7455
7455
val -> kind = ZEND_FFI_VAL_ERROR ;
7456
7456
}
7457
- if ((str [4 ] >= '0' || str [4 ] <= '7' ) && str_len == 6 ) {
7457
+ if ((str [4 ] >= '0' && str [4 ] <= '7' ) && str_len == 6 ) {
7458
7458
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 ) {
7460
7460
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 ) {
7462
7462
n = n * 16 + (str [4 ] - 'a' );
7463
7463
} else if (str_len != 5 ) {
7464
7464
val -> kind = ZEND_FFI_VAL_ERROR ;
0 commit comments