From: Xinchen Hui <laruence@php.net>
Date: Sun, 16 Oct 2011 03:00:51 +0000 (+0000)
Subject: Fixed bug #60038 (SIGALRM cause segfault in php_error_cb)
X-Git-Tag: php-5.5.0alpha1~1010
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=077519d3fbe3aca87f392993c81f526ef2c6b635;p=php

Fixed bug #60038 (SIGALRM cause segfault in php_error_cb)
---

diff --git a/main/main.c b/main/main.c
index 67d2ff1b1e..cc7c078539 100644
--- a/main/main.c
+++ b/main/main.c
@@ -900,6 +900,9 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
 
 	/* store the error if it has changed */
 	if (display) {
+#ifdef ZEND_SIGNALS
+		HANDLE_BLOCK_INTERRUPTIONS();	
+#endif
 		if (PG(last_error_message)) {
 			free(PG(last_error_message));
 			PG(last_error_message) = NULL;
@@ -908,6 +911,9 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
 			free(PG(last_error_file));
 			PG(last_error_file) = NULL;
 		}
+#ifdef ZEND_SIGNALS
+		HANDLE_UNBLOCK_INTERRUPTIONS();
+#endif
 		if (!error_filename) {
 			error_filename = "Unknown";
 		}