]> granicus.if.org Git - php/commitdiff
- Don't throw exception for uninitialized instance
authorMarcus Boerger <helly@php.net>
Fri, 21 Mar 2008 23:56:52 +0000 (23:56 +0000)
committerMarcus Boerger <helly@php.net>
Fri, 21 Mar 2008 23:56:52 +0000 (23:56 +0000)
ext/phar/phar_object.c

index be5c763fed1cea213e7a4d3a15603284bc3374e2..355bd0910792844b8697748b47f2e7fd7dff27d4 100755 (executable)
@@ -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;