Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:1746
Return-Path: <list@firehawksystems.com>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 38843 invoked from network); 20 May 2003 00:31:30 -0000
Received: from unknown (HELO lt1.firehawksystems.com) (64.71.143.247)
  by pb1.pair.com with SMTP; 20 May 2003 00:31:30 -0000
Received: from wireless-laptop.firehawksystems.com (adsl-63-206-171-184.dsl.sktn01.pacbell.net [63.206.171.184])
	(authenticated (0 bits))
	by lt1.firehawksystems.com (8.11.6p2/8.11.6) with ESMTP id h4K0VPA09691
	(using TLSv1/SSLv3 with cipher EDH-RSA-DES-CBC3-SHA (168 bits) verified NO)
	for <internals@lists.php.net>; Mon, 19 May 2003 17:31:28 -0700
Date: Mon, 19 May 2003 17:31:23 -0700
To: internals@lists.php.net
Message-ID: <20030519173123910053.GyazMail.list@firehawksystems.com>
Mime-Version: 1.0 (GMessage framework 0.9.9.9)
Content-Type: multipart/mixed; boundary=Multipart_20030519173123714712
X-Mailer: GyazMail version 0.9.9.9
Subject: [PATCH] include_once/require_once core dump
From: list@firehawksystems.com ("Brian J. France")

--Multipart_20030519173123714712
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Can somebody with karma check in the following patch?

If zend_open fails for require_once or include_oncde, file_handle is
not defined and can't be used for the error/warning message.
Changed to inc_filename->value.str.val which is what is passed to zend_open.

Thanks,

Brian


--Multipart_20030519173123714712
Content-Type: text/plain; name=patch.txt
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment; filename=patch.txt

Index: zend_execute.c
=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
RCS file: /repository/Zend/zend_execute.c,v
retrieving revision 1.316.2.8
diff -u -p -r1.316.2.8 zend_execute.c
--- zend_execute.c      17 May 2003 07:49:29 -0000      1.316.2.8
+++ zend_execute.c      20 May 2003 00:27:05 -0000
@@ -2123,9 +2123,9 @@ send_by_ref:
                                                                        }
                                                                } else {
                                                                        if =
(EX(opline)->op2.u.constant.value.lval=3D=3DZEND_INCLUDE_ONCE) {
-                                                                          =
     zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle.filenam=
e);
+                                                                          =
     zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, inc_filename->value=
.str.val);
                                                                        } e=
lse {
-                                                                          =
     zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle.filenam=
e);
+                                                                          =
     zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, inc_filename->value=
.str.val);
                                                                        }
                                                                }
                                                                break;

--Multipart_20030519173123714712
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit



--Multipart_20030519173123714712--