Skip to content

Commit 5d15d2b

Browse files
committed
Removed useless signal protection
1 parent de63ebf commit 5d15d2b

File tree

1 file changed

+1
-17
lines changed

1 file changed

+1
-17
lines changed

Zend/zend_alloc.c

+1-17
Original file line numberDiff line numberDiff line change
@@ -2472,15 +2472,11 @@ ZEND_API void* ZEND_FASTCALL _ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_D
24722472
{
24732473
void *p;
24742474

2475-
HANDLE_BLOCK_INTERRUPTIONS();
2476-
24772475
p = _safe_emalloc(nmemb, size, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
24782476
if (UNEXPECTED(p == NULL)) {
2479-
HANDLE_UNBLOCK_INTERRUPTIONS();
24802477
return p;
24812478
}
24822479
memset(p, 0, size * nmemb);
2483-
HANDLE_UNBLOCK_INTERRUPTIONS();
24842480
return p;
24852481
}
24862482

@@ -2489,33 +2485,25 @@ ZEND_API char* ZEND_FASTCALL _estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_
24892485
size_t length;
24902486
char *p;
24912487

2492-
HANDLE_BLOCK_INTERRUPTIONS();
2493-
24942488
length = strlen(s);
24952489
p = (char *) _emalloc(safe_address(length, 1, 1) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
24962490
if (UNEXPECTED(p == NULL)) {
2497-
HANDLE_UNBLOCK_INTERRUPTIONS();
24982491
return p;
24992492
}
25002493
memcpy(p, s, length+1);
2501-
HANDLE_UNBLOCK_INTERRUPTIONS();
25022494
return p;
25032495
}
25042496

25052497
ZEND_API char* ZEND_FASTCALL _estrndup(const char *s, size_t length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
25062498
{
25072499
char *p;
25082500

2509-
HANDLE_BLOCK_INTERRUPTIONS();
2510-
25112501
p = (char *) _emalloc(safe_address(length, 1, 1) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
25122502
if (UNEXPECTED(p == NULL)) {
2513-
HANDLE_UNBLOCK_INTERRUPTIONS();
25142503
return p;
25152504
}
25162505
memcpy(p, s, length);
25172506
p[length] = 0;
2518-
HANDLE_UNBLOCK_INTERRUPTIONS();
25192507
return p;
25202508
}
25212509

@@ -2524,18 +2512,14 @@ ZEND_API char* ZEND_FASTCALL zend_strndup(const char *s, size_t length)
25242512
{
25252513
char *p;
25262514

2527-
HANDLE_BLOCK_INTERRUPTIONS();
2528-
25292515
p = (char *) malloc(safe_address(length, 1, 1));
25302516
if (UNEXPECTED(p == NULL)) {
2531-
HANDLE_UNBLOCK_INTERRUPTIONS();
25322517
return p;
25332518
}
2534-
if (length) {
2519+
if (EXPECTED(length)) {
25352520
memcpy(p, s, length);
25362521
}
25372522
p[length] = 0;
2538-
HANDLE_UNBLOCK_INTERRUPTIONS();
25392523
return p;
25402524
}
25412525

0 commit comments

Comments
 (0)