Skip to content

Commit f35b194

Browse files
committed
Assert that cpuinfo is initialized before use
And fix some incorrect indentation.
1 parent 4a7ebb6 commit f35b194

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Zend/zend_cpuinfo.c

+1
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ void zend_cpu_startup(void)
9999
}
100100

101101
ZEND_API int zend_cpu_supports(zend_cpu_feature feature) {
102+
ZEND_ASSERT(cpuinfo.initialized);
102103
if (feature & ZEND_CPU_EDX_MASK) {
103104
return (cpuinfo.edx & (feature & ~ZEND_CPU_EDX_MASK));
104105
} else if (feature & ZEND_CPU_EBX_MASK) {

Zend/zend_cpuinfo.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,9 @@ static zend_always_inline int zend_cpu_supports_sse42() {
164164
ZEND_NO_SANITIZE_ADDRESS
165165
static zend_always_inline int zend_cpu_supports_pclmul() {
166166
#if PHP_HAVE_BUILTIN_CPU_INIT
167-
__builtin_cpu_init();
167+
__builtin_cpu_init();
168168
#endif
169-
return __builtin_cpu_supports("pclmul");
169+
return __builtin_cpu_supports("pclmul");
170170
}
171171
#endif
172172

@@ -208,7 +208,7 @@ static zend_always_inline int zend_cpu_supports_sse42() {
208208
}
209209

210210
static zend_always_inline int zend_cpu_supports_pclmul() {
211-
return zend_cpu_supports(ZEND_CPU_FEATURE_PCLMULQDQ);
211+
return zend_cpu_supports(ZEND_CPU_FEATURE_PCLMULQDQ);
212212
}
213213

214214
static zend_always_inline int zend_cpu_supports_avx() {

0 commit comments

Comments
 (0)