From: Zeev Suraski <zeev@php.net>
Date: Sat, 18 Nov 2000 11:43:08 +0000 (+0000)
Subject: Forgot to commit the non-debug build fix yesterday...
X-Git-Tag: php-4.0.4RC3~157
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42b0e1cb1f90d36735265e0c2d51cbb6c8c2983d;p=php

Forgot to commit the non-debug build fix yesterday...
---

diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index dd17fb33ba..1741ce211c 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -199,13 +199,11 @@ ZEND_API void _efree(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 	DECLARE_CACHE_VARS
 	ALS_FETCH();
 
-#ifdef ZTS
+#if defined(ZTS) && ZEND_DEBUG
 	if (p->thread_id != tsrm_thread_id()) {
-# if ZEND_DEBUG
 		tsrm_error(TSRM_ERROR_LEVEL_ERROR, "Memory block allocated at %s:(%d) on thread %x freed at %s:(%d) on thread %x, ignoring",
 			p->filename, p->lineno, p->thread_id,
 			__zend_filename, __zend_lineno, tsrm_thread_id());
-# endif
 		return;
 	}
 #endif
@@ -270,15 +268,13 @@ ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure ZEND_FILE_LIN
 		return _emalloc(size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
 	}
 
-#ifdef ZTS
+#if defined(ZTS) && ZEND_DEBUG
 	if (p->thread_id != tsrm_thread_id()) {
 		void *new_p;
 
-# if ZEND_DEBUG
 		tsrm_error(TSRM_ERROR_LEVEL_ERROR, "Memory block allocated at %s:(%d) on thread %x reallocated at %s:(%d) on thread %x, duplicating",
 			p->filename, p->lineno, p->thread_id,
 			__zend_filename, __zend_lineno, tsrm_thread_id());
-# endif
 		new_p = _emalloc(size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
 		memcpy(new_p, ptr, p->size);
 		return new_p;