Skip to content

Commit eb4663e

Browse files
committed
Finalize
1 parent 8cc29af commit eb4663e

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

Zend/zend_alloc.c

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,20 +178,31 @@ static size_t _real_page_size = ZEND_MM_PAGE_SIZE;
178178
#ifdef __SANITIZE_ADDRESS__
179179
# include <sanitizer/asan_interface.h>
180180

181+
#if 0
182+
183+
#define ZEND_MM_POISON_DEBUG(_type, _ptr, _size) do { \
184+
fprintf(stderr, "%s %p - %p in %d\n", (_type), (_ptr), ((size_t)_ptr)+((size_t)_size), __LINE__); \
185+
fflush(stderr); \
186+
} while (0);
187+
188+
#else
189+
190+
#define ZEND_MM_POISON_DEBUG
191+
192+
#endif
193+
181194
#define ZEND_MM_POISON(_ptr, _size) do { \
182195
if (UNEXPECTED(((size_t) (_ptr)) & ((size_t)7))) { \
183196
zend_mm_panic("Wrong alignment"); \
184197
} \
185-
fprintf(stderr, "Poisoning %p - %p in %d\n", (_ptr), ((size_t)_ptr)+((size_t)_size), __LINE__); \
186-
fflush(stderr); \
198+
ZEND_MM_POISON_DEBUG("Poisoning", (_ptr), (_size)); \
187199
ASAN_POISON_MEMORY_REGION((_ptr), (_size));\
188200
} while (0);
189201
#define ZEND_MM_UNPOISON(_ptr, _size) do { \
190202
if (UNEXPECTED(((size_t) (_ptr)) & ((size_t)7))) { \
191203
zend_mm_panic("Wrong alignment"); \
192204
} \
193-
fprintf(stderr, "Unpoisoning %p - %p in %d\n", (_ptr), ((size_t)_ptr)+((size_t)_size), __LINE__); \
194-
fflush(stderr); \
205+
ZEND_MM_POISON_DEBUG("Unpoisoning", (_ptr), (_size)); \
195206
ASAN_UNPOISON_MEMORY_REGION((_ptr), (_size));\
196207
} while (0);
197208

0 commit comments

Comments
 (0)