@@ -2472,15 +2472,11 @@ ZEND_API void* ZEND_FASTCALL _ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_D
2472
2472
{
2473
2473
void * p ;
2474
2474
2475
- HANDLE_BLOCK_INTERRUPTIONS ();
2476
-
2477
2475
p = _safe_emalloc (nmemb , size , 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC );
2478
2476
if (UNEXPECTED (p == NULL )) {
2479
- HANDLE_UNBLOCK_INTERRUPTIONS ();
2480
2477
return p ;
2481
2478
}
2482
2479
memset (p , 0 , size * nmemb );
2483
- HANDLE_UNBLOCK_INTERRUPTIONS ();
2484
2480
return p ;
2485
2481
}
2486
2482
@@ -2489,33 +2485,25 @@ ZEND_API char* ZEND_FASTCALL _estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_
2489
2485
size_t length ;
2490
2486
char * p ;
2491
2487
2492
- HANDLE_BLOCK_INTERRUPTIONS ();
2493
-
2494
2488
length = strlen (s );
2495
2489
p = (char * ) _emalloc (safe_address (length , 1 , 1 ) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC );
2496
2490
if (UNEXPECTED (p == NULL )) {
2497
- HANDLE_UNBLOCK_INTERRUPTIONS ();
2498
2491
return p ;
2499
2492
}
2500
2493
memcpy (p , s , length + 1 );
2501
- HANDLE_UNBLOCK_INTERRUPTIONS ();
2502
2494
return p ;
2503
2495
}
2504
2496
2505
2497
ZEND_API char * ZEND_FASTCALL _estrndup (const char * s , size_t length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC )
2506
2498
{
2507
2499
char * p ;
2508
2500
2509
- HANDLE_BLOCK_INTERRUPTIONS ();
2510
-
2511
2501
p = (char * ) _emalloc (safe_address (length , 1 , 1 ) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC );
2512
2502
if (UNEXPECTED (p == NULL )) {
2513
- HANDLE_UNBLOCK_INTERRUPTIONS ();
2514
2503
return p ;
2515
2504
}
2516
2505
memcpy (p , s , length );
2517
2506
p [length ] = 0 ;
2518
- HANDLE_UNBLOCK_INTERRUPTIONS ();
2519
2507
return p ;
2520
2508
}
2521
2509
@@ -2524,18 +2512,14 @@ ZEND_API char* ZEND_FASTCALL zend_strndup(const char *s, size_t length)
2524
2512
{
2525
2513
char * p ;
2526
2514
2527
- HANDLE_BLOCK_INTERRUPTIONS ();
2528
-
2529
2515
p = (char * ) malloc (safe_address (length , 1 , 1 ));
2530
2516
if (UNEXPECTED (p == NULL )) {
2531
- HANDLE_UNBLOCK_INTERRUPTIONS ();
2532
2517
return p ;
2533
2518
}
2534
- if (length ) {
2519
+ if (EXPECTED ( length ) ) {
2535
2520
memcpy (p , s , length );
2536
2521
}
2537
2522
p [length ] = 0 ;
2538
- HANDLE_UNBLOCK_INTERRUPTIONS ();
2539
2523
return p ;
2540
2524
}
2541
2525
0 commit comments