better initialization

Author: dunglas

Zend/zend.c

@@ -1632,7 +1632,7 @@ ZEND_API ZEND_COLD void zend_strerror_noreturn(int type, int errn, const char *m
 {
 #ifdef HAVE_STR_ERROR_R
 	char buf[1024];
-	strerror_r(errn, buf, sizeof(buf)) != 0;
+	strerror_r(errn, buf, sizeof(buf));
 #else
 	char *buf = strerror(errn);
 #endif

Zend/zend_execute_API.c

@@ -199,6 +199,11 @@ void init_executor(void) /* {{{ */
 	zend_weakrefs_init();
 
 	EG(active) = 1;
+
+#ifdef ZEND_TIMER
+	memset(EG(timer), 0, sizeof(*EG(timer)));
+	memset(&EG(oldact), 0, sizeof(EG(oldact)));
+#endif
 }
 /* }}} */
 

Zend/zend_timer.c

@@ -53,10 +53,8 @@ ZEND_API void zend_timer_create(void) /* {{{ */
 	sev.sigev_signo = SIGIO;
 	sev.sigev_notify_thread_id = (pid_t) syscall(SYS_gettid);
 
-	if (timer_create(CLOCK_THREAD_CPUTIME_ID, &sev, &EG(timer)) != 0) {
-		EG(timer) = 0;
+	if (timer_create(CLOCK_THREAD_CPUTIME_ID, &sev, &EG(timer)) != 0)
 		zend_strerror_noreturn(E_ERROR, errno, "Could not create timer");
-	}
 
 #  ifdef TIMER_DEBUG
 		fprintf(stderr, "Timer %#jx created on thread %d\n", (uintmax_t) EG(timer), sev.sigev_notify_thread_id);