Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:23865 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 20708 invoked by uid 1010); 2 Jun 2006 06:43:36 -0000 Delivered-To: ezmlm-scan-internals@lists.php.net Delivered-To: ezmlm-internals@lists.php.net Received: (qmail 20693 invoked from network); 2 Jun 2006 06:43:36 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 2 Jun 2006 06:43:36 -0000 X-PHP-List-Original-Sender: steph@zend.com X-Host-Fingerprint: 192.38.9.232 gw2.emini.dk Linux 2.4/2.6 Received: from ([192.38.9.232:3373] helo=gw2.emini.dk) by pb1.pair.com (ecelerity 2.0 beta r(6323M)) with SMTP id 09/78-22639-71EDF744 for ; Fri, 02 Jun 2006 02:43:36 -0400 Received: from foxbox (IGLD-84-228-79-24.inter.net.il [84.228.79.24]) by gw2.emini.dk (Postfix) with ESMTP id E3784B4A50; Fri, 2 Jun 2006 08:43:30 +0200 (CEST) Message-ID: <0c1001c6860f$8c3fa310$6602a8c0@foxbox> Reply-To: "Steph Fox" To: "Dmitry Stogov" Cc: "internals" Date: Fri, 2 Jun 2006 08:41:14 +0200 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_0C0D_01C68620.4ED56080" X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2900.2180 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2180 Subject: [PATCH] the most bizarre thing... From: steph@zend.com ("Steph Fox") ------=_NextPart_000_0C0D_01C68620.4ED56080 Content-Type: text/plain; format=flowed; charset="iso-8859-1"; reply-type=original Content-Transfer-Encoding: 7bit Dmitry, have you _any_ idea why this might fix my CG table-freeing crash? It still gets past the != check, so presumably it still does the same destroy-and-free - but it works now?! - Steph ------=_NextPart_000_0C0D_01C68620.4ED56080 Content-Type: text/plain; format=flowed; name="Zend_strangeness.txt"; reply-type=original Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="Zend_strangeness.txt" Index: Zend/zend.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /repository/ZendEngine2/zend.c,v=0A= retrieving revision 1.308.2.12.2.8=0A= diff -u -r1.308.2.12.2.8 zend.c=0A= --- Zend/zend.c 19 May 2006 06:09:14 -0000 1.308.2.12.2.8=0A= +++ Zend/zend.c 2 Jun 2006 06:26:41 -0000=0A= @@ -462,15 +462,15 @@=0A= =0A= static void compiler_globals_dtor(zend_compiler_globals = *compiler_globals TSRMLS_DC)=0A= {=0A= - if (compiler_globals->function_table !=3D GLOBAL_FUNCTION_TABLE) {=0A= + if (GLOBAL_FUNCTION_TABLE && (compiler_globals->function_table !=3D = GLOBAL_FUNCTION_TABLE)) {=0A= zend_hash_destroy(compiler_globals->function_table);=0A= free(compiler_globals->function_table);=0A= }=0A= - if (compiler_globals->class_table !=3D GLOBAL_CLASS_TABLE) {=0A= + if (GLOBAL_CLASS_TABLE && (compiler_globals->class_table !=3D = GLOBAL_CLASS_TABLE)) {=0A= zend_hash_destroy(compiler_globals->class_table);=0A= free(compiler_globals->class_table);=0A= }=0A= - if (compiler_globals->auto_globals !=3D GLOBAL_AUTO_GLOBALS_TABLE) {=0A= + if (GLOBAL_AUTO_GLOBALS_TABLE && (compiler_globals->auto_globals !=3D = GLOBAL_AUTO_GLOBALS_TABLE)) {=0A= zend_hash_destroy(compiler_globals->auto_globals);=0A= free(compiler_globals->auto_globals);=0A= }=0A= ------=_NextPart_000_0C0D_01C68620.4ED56080--