From: Marcus Boerger <helly@php.net>
Date: Fri, 21 Mar 2008 23:56:52 +0000 (+0000)
Subject: - Don't throw exception for uninitialized instance
X-Git-Tag: RELEASE_2_0_0a1~53
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d8073056c4b6771787d521ff37f2c98287e908c;p=php

- Don't throw exception for uninitialized instance
---

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index be5c763fed..355bd09107 100755
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -3034,9 +3034,9 @@ PHP_METHOD(PharFileInfo, __construct)
  */
 PHP_METHOD(PharFileInfo, __destruct)
 {
-	PHAR_ENTRY_OBJECT();
+	phar_entry_object *entry_obj = (phar_entry_object*)zend_object_store_get_object(getThis() TSRMLS_CC); \
 
-	if (entry_obj->ent.entry->is_temp_dir) {
+	if (entry_obj->ent.entry && entry_obj->ent.entry->is_temp_dir) {
 		if (entry_obj->ent.entry->filename) {
 			efree(entry_obj->ent.entry->filename);
 			entry_obj->ent.entry->filename = NULL;