numerous memory leaks fixed

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@689 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-ical/NGiCal/ChangeLog b/sope-ical/NGiCal/ChangeLog
index 3816b102fd786a223109854245a1fd559f20fd92..c15b752fd1287f8e931d42aa9f813cbdf2511ee9 100644 (file)
--- a/sope-ical/NGiCal/ChangeLog
+++ b/sope-ical/NGiCal/ChangeLog
@@ -1,3 +1,13 @@
+2005-03-23  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * v4.5.50
+
+       * iCalRenderer.h: added missing paranthesis for iVar declarations
+
+       * iCalTrigger.m, iCalEntityObject.m, iCalToDo.m,
+         iCalRecurrenceCalculator.m, iCalDateHolder.m, iCalDataSource.m,
+         iCalPerson.m, iCalCalendar.m: numerous dealloc bugs/leaks fixed
+
 2005-03-02  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * iCalRecurrenceCalculator.m: bugfix for monthly and yearly recurrences

diff --git a/sope-ical/NGiCal/NGiCal.xcode/project.pbxproj b/sope-ical/NGiCal/NGiCal.xcode/project.pbxproj
index ab29263e93e01b9869e4e17810cec1cf0fb28c74..fe65148ec60d7d85f85c7975a3b3eeff3e6b8347 100644 (file)
--- a/sope-ical/NGiCal/NGiCal.xcode/project.pbxproj
+++ b/sope-ical/NGiCal/NGiCal.xcode/project.pbxproj
@@ -15,7 +15,7 @@
                        sourceTree = "<group>";
                };
                AD770E6807AE627500F5C7A1 = {
-                       fileEncoding = 12;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
@@ -39,7 +39,8 @@
                        };
                };
                AD77103C07AE8F8500F5C7A1 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = iCalRepeatableEntityObject.h;
@@ -47,7 +48,8 @@
                        sourceTree = "<group>";
                };
                AD77103D07AE8F8500F5C7A1 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = iCalRepeatableEntityObject.m;
@@ -84,7 +86,8 @@
                        };
                };
                ADAACE6607B3973900FC48D6 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = iCalRecurrenceCalculator.h;
@@ -93,6 +96,7 @@
                };
                ADAACE6707B3973900FC48D6 = {
                        fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = iCalRecurrenceCalculator.m;
@@ -173,7 +177,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.49;
+                               DYLIB_CURRENT_VERSION = 4.5.50;
                                FRAMEWORK_SEARCH_PATHS = "\"$(USER_LIBRARY_DIR)/EmbeddedFrameworks\"";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -587,7 +591,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.49;
+                               DYLIB_CURRENT_VERSION = 4.5.50;
                                FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -679,7 +683,7 @@
                        usesTabs = 1;
                };
                ADDF4F1306DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
@@ -737,7 +741,7 @@
                        usesTabs = 1;
                };
                ADDF4F1906DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
@@ -746,7 +750,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F1A06DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
@@ -755,7 +759,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F1B06DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
@@ -764,7 +768,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F1C06DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
@@ -773,7 +777,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F1D06DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
@@ -782,7 +786,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F1E06DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
@@ -791,7 +795,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F1F06DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
@@ -800,7 +804,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F2006DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
@@ -809,7 +813,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F2106DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
@@ -818,7 +822,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F2206DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
@@ -827,7 +831,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F2306DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
@@ -836,7 +840,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F2406DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
@@ -854,7 +858,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F2606DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
@@ -863,7 +867,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F2706DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
@@ -872,7 +876,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F2806DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
@@ -881,7 +885,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F2906DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
@@ -890,7 +894,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F2A06DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
@@ -899,7 +903,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F2B06DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
@@ -908,7 +912,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F2C06DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
@@ -917,7 +921,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F2D06DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
@@ -926,7 +930,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F2E06DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
@@ -935,7 +939,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F2F06DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
@@ -944,7 +948,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F3006DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
@@ -953,7 +957,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F3106DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
@@ -980,7 +984,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F3406DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
@@ -989,7 +993,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F3506DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
@@ -998,7 +1002,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F3606DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
@@ -1007,7 +1011,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F3706DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
@@ -1016,7 +1020,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F3806DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
@@ -1034,7 +1038,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F3A06DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
@@ -1043,7 +1047,7 @@
                        sourceTree = "<group>";
                };
                ADDF4F3B06DE513D00C4E7F8 = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;

diff --git a/sope-ical/NGiCal/Version b/sope-ical/NGiCal/Version
index 4d808abe41ad8209cbe35b7e199447f1e8251528..a3ca3e852b6ab7033a6343aadcc9c472e70bd2f0 100644 (file)
--- a/sope-ical/NGiCal/Version
+++ b/sope-ical/NGiCal/Version
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION=4
 MINOR_VERSION=5
-SUBMINOR_VERSION:=49
+SUBMINOR_VERSION:=50
 
 # v4.5.40 requires NGExtensions v4.5.145
 # v4.5.37 requires NGExtensions v4.5.140

diff --git a/sope-ical/NGiCal/iCalCalendar.m b/sope-ical/NGiCal/iCalCalendar.m
index 6daacc970f46e33915d192efb83ad04385288c19..30cc36d9158c6f71771102adf1bf4ee1be6b0720 100644 (file)
--- a/sope-ical/NGiCal/iCalCalendar.m
+++ b/sope-ical/NGiCal/iCalCalendar.m
@@ -25,14 +25,15 @@
 @implementation iCalCalendar
 
 - (void)dealloc {
-  [self->todos     release];
-  [self->timezones release];
-  [self->events    release];
-  [self->freeBusys release];
-  [self->journals  release];
   [self->version   release];
   [self->calscale  release];
   [self->prodId    release];
+    
+  [self->todos     release];
+  [self->events    release];
+  [self->journals  release];
+  [self->freeBusys release];
+  [self->timezones release];
   [super dealloc];
 }
 

diff --git a/sope-ical/NGiCal/iCalDataSource.m b/sope-ical/NGiCal/iCalDataSource.m
index 37fd0b35404c84cff819562ae5d293bb9021f191..92b00f98c34371c9fb9369b7ab9d6db0061538c9 100644 (file)
--- a/sope-ical/NGiCal/iCalDataSource.m
+++ b/sope-ical/NGiCal/iCalDataSource.m
@@ -91,8 +91,8 @@ static SaxObjectDecoder *sax = nil;
 
 - (void)dealloc {
   [self->fetchSpecification release];
-  [self->entityName release];
-  [self->url release];
+  [self->url                release];
+  [self->entityName         release];
   [super dealloc];
 }
 

diff --git a/sope-ical/NGiCal/iCalDateHolder.m b/sope-ical/NGiCal/iCalDateHolder.m
index 566e769847ad5f5752dae6f5e339b8ff3adf49ab..202bb1e551393ef17e41bb80c7e46f0fc30b59fb 100644 (file)
--- a/sope-ical/NGiCal/iCalDateHolder.m
+++ b/sope-ical/NGiCal/iCalDateHolder.m
@@ -39,8 +39,8 @@ static NSTimeZone *gmt = nil;
 }
 
 - (void)dealloc {
-  [self->string release];
   [self->tzid   release];
+  [self->string release];
   [self->tag    release];
   [super dealloc];
 }

diff --git a/sope-ical/NGiCal/iCalEntityObject.m b/sope-ical/NGiCal/iCalEntityObject.m
index 2d45b784ffe40fa805e4f519c964e685b9be11db..313ab128dd2b00c454b3a60c14015ba6395f0342 100644 (file)
--- a/sope-ical/NGiCal/iCalEntityObject.m
+++ b/sope-ical/NGiCal/iCalEntityObject.m
@@ -30,11 +30,6 @@
 @implementation iCalEntityObject
 
 - (void)dealloc {
-  [self->status       release];
-  [self->location     release];
-  [self->sequence     release];
-  [self->startDate    release];
-  [self->comment      release];
   [self->uid          release];
   [self->summary      release];
   [self->created      release];
@@ -45,6 +40,10 @@
   [self->alarms       release];
   [self->organizer    release];
   [self->attendees    release];
+  [self->comment      release];
+  [self->sequence     release];
+  [self->location     release];
+  [self->status       release];
   [self->categories   release];
   [super dealloc];
 }

diff --git a/sope-ical/NGiCal/iCalPerson.m b/sope-ical/NGiCal/iCalPerson.m
index 06416b53d09d16aead01796101db7e054560799e..888c92be25999f0c385e43052c8e46bdbbe7d0dd 100644 (file)
--- a/sope-ical/NGiCal/iCalPerson.m
+++ b/sope-ical/NGiCal/iCalPerson.m
@@ -25,12 +25,12 @@
 @implementation iCalPerson
 
 - (void)dealloc {
+  [self->cn       release];
+  [self->email    release];
   [self->rsvp     release];
   [self->partStat release];
   [self->role     release];
   [self->xuid     release];
-  [self->email release];
-  [self->cn    release];
   [super dealloc];
 }
 
@@ -132,6 +132,7 @@
       [NSException raise:NSInternalInconsistencyException
                    format:@"Attempt to set meaningless "
                           @"participationStatus (%d)!", _status];
+      stat = nil; /* keep compiler happy */
       break;
     default:
       stat = @"NEEDS-ACTION";

diff --git a/sope-ical/NGiCal/iCalRecurrenceCalculator.m b/sope-ical/NGiCal/iCalRecurrenceCalculator.m
index 18ef6b3c225db7cb93233de63397060f11493580..b141038b9421c89f7b9caa2f9aa3e156f9043891 100644 (file)
--- a/sope-ical/NGiCal/iCalRecurrenceCalculator.m
+++ b/sope-ical/NGiCal/iCalRecurrenceCalculator.m
@@ -217,6 +217,14 @@ static Class yearlyCalcClass  = Nil;
   return self;  
 }
 
+/* dealloc */
+
+- (void)dealloc {
+  [self->firstRange release];
+  [self->rrule      release];
+  [super dealloc];
+}
+
 /* helpers */
 
 - (unsigned)offsetFromSundayForJulianNumber:(long)_jn {

diff --git a/sope-ical/NGiCal/iCalRenderer.h b/sope-ical/NGiCal/iCalRenderer.h
index 9d4cd091a44f5cf9934e373b470f1f907a07d580..a7347c9167c21d0db4a1cf37c8a0344adeb5732c 100644 (file)
--- a/sope-ical/NGiCal/iCalRenderer.h
+++ b/sope-ical/NGiCal/iCalRenderer.h
@@ -34,6 +34,8 @@
 @class iCalEvent;
 
 @interface iCalRenderer : NSObject
+{
+}
 
 + (id)sharedICalendarRenderer;
 

diff --git a/sope-ical/NGiCal/iCalToDo.m b/sope-ical/NGiCal/iCalToDo.m
index bda4e84f8e49bdb657fca2b87782741373971ce2..13549b56cd81a730c32f5b7d0326ebf42989fdd5 100644 (file)
--- a/sope-ical/NGiCal/iCalToDo.m
+++ b/sope-ical/NGiCal/iCalToDo.m
@@ -26,15 +26,9 @@
 @implementation iCalToDo
 
 - (void)dealloc {
-  [self->accessClass     release];
+  [self->due             release];
   [self->percentComplete release];
-  [self->completed      release];
-  [self->sequence       release];
-  [self->uid            release];
-  [self->summary        release];
-  [self->startDate      release];
-  [self->due            release];
-  [self->priority       release];
+  [self->completed       release];
   [super dealloc];
 }
 

diff --git a/sope-ical/NGiCal/iCalTrigger.m b/sope-ical/NGiCal/iCalTrigger.m
index 6be31cea0b2633bb3644f1cd35d7476fd5e1df3d..4ba3aac913e46513b4e585d1692e0da6d8176469 100644 (file)
--- a/sope-ical/NGiCal/iCalTrigger.m
+++ b/sope-ical/NGiCal/iCalTrigger.m
@@ -25,8 +25,8 @@
 @implementation iCalTrigger
 
 - (void)dealloc {
-  [self->value     release];
   [self->valueType release];
+  [self->value     release];
   [super dealloc];
 }
 

diff --git a/sope-xml/SaxObjC/ChangeLog b/sope-xml/SaxObjC/ChangeLog
index c6a616da402911e92882a53660fd987e6f78c2c4..fae76d192e604683836a4d21c0916b3798ec1791 100644 (file)
--- a/sope-xml/SaxObjC/ChangeLog
+++ b/sope-xml/SaxObjC/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-23  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * SaxObjectDecoder.m: fixed remaining leaks (v4.5.49)
+
 2005-01-29  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * SaxObjectDecoder.m: fixed hard to spot autorelease bug (v4.5.48)

diff --git a/sope-xml/SaxObjC/SaxObjC.xcode/project.pbxproj b/sope-xml/SaxObjC/SaxObjC.xcode/project.pbxproj
index ec2fd308e9d0324edd551f35f885c6ec65fab288..0edf7c9da1b210aeb2158f40c6a4e64274bc6348 100644 (file)
--- a/sope-xml/SaxObjC/SaxObjC.xcode/project.pbxproj
+++ b/sope-xml/SaxObjC/SaxObjC.xcode/project.pbxproj
@@ -46,6 +46,104 @@
                        remoteGlobalIDString = ADDF535406DE6CC800C4E7F8;
                        remoteInfo = libxmlSAXDriver;
                };
+               AD85719F07EF239100D5FC5B = {
+                       children = (
+                               AD8571A007EF23BB00D5FC5B,
+                       );
+                       isa = PBXGroup;
+                       name = Tools;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD8571A007EF23BB00D5FC5B = {
+                       fileEncoding = 5;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       name = saxxml.m;
+                       path = ../samples/saxxml.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               AD8573D807EF567800D5FC5B = {
+                       buildActionMask = 2147483647;
+                       files = (
+                               AD8573DD07EF569F00D5FC5B,
+                       );
+                       isa = PBXSourcesBuildPhase;
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               AD8573D907EF567800D5FC5B = {
+                       buildActionMask = 2147483647;
+                       files = (
+                               AD8573DE07EF56A600D5FC5B,
+                               AD8573DF07EF56AC00D5FC5B,
+                       );
+                       isa = PBXFrameworksBuildPhase;
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               AD8573DA07EF567800D5FC5B = {
+                       buildPhases = (
+                               AD8573D807EF567800D5FC5B,
+                               AD8573D907EF567800D5FC5B,
+                       );
+                       buildRules = (
+                       );
+                       buildSettings = {
+                               GCC_PRECOMPILE_PREFIX_HEADER = NO;
+                               INSTALL_PATH = /usr/local/bin;
+                               OPTIMIZATION_CFLAGS = "";
+                               OTHER_CFLAGS = "";
+                               OTHER_REZFLAGS = "";
+                               PRODUCT_NAME = saxxml;
+                               SECTORDER_FLAGS = "";
+                               WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
+                       };
+                       dependencies = (
+                       );
+                       isa = PBXNativeTarget;
+                       name = saxxml;
+                       productName = saxxml;
+                       productReference = AD8573DB07EF567800D5FC5B;
+                       productType = "com.apple.product-type.tool";
+               };
+               AD8573DB07EF567800D5FC5B = {
+                       explicitFileType = "compiled.mach-o.executable";
+                       includeInIndex = 0;
+                       isa = PBXFileReference;
+                       path = saxxml;
+                       refType = 3;
+                       sourceTree = BUILT_PRODUCTS_DIR;
+               };
+               AD8573DD07EF569F00D5FC5B = {
+                       fileRef = AD8571A007EF23BB00D5FC5B;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               AD8573DE07EF56A600D5FC5B = {
+                       fileRef = ADDF55F306DE737500C4E7F8;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               AD8573DF07EF56AC00D5FC5B = {
+                       fileRef = ADDF54A906DE727A00C4E7F8;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               AD8573F807EF56F300D5FC5B = {
+                       containerPortal = ADDF549E06DE724700C4E7F8;
+                       isa = PBXContainerItemProxy;
+                       proxyType = 1;
+                       remoteGlobalIDString = AD8573DA07EF567800D5FC5B;
+                       remoteInfo = saxxml;
+               };
+               AD8573F907EF56F300D5FC5B = {
+                       isa = PBXTargetDependency;
+                       target = AD8573DA07EF567800D5FC5B;
+                       targetProxy = AD8573F807EF56F300D5FC5B;
+               };
                ADABC83007003DAB00B582C7 = {
                        buildPhases = (
                        );
@@ -57,6 +155,7 @@
                                ADABC83C07003DE300B582C7,
                                ADABC83E07003DE800B582C7,
                                ADABC8A107004CC600B582C7,
+                               AD8573F907EF56F300D5FC5B,
                        );
                        isa = PBXAggregateTarget;
                        name = all;
@@ -222,6 +321,7 @@
                                ADDF550D06DE72BE00C4E7F8,
                                ADDF551006DE72EE00C4E7F8,
                                ADDF557106DE72FC00C4E7F8,
+                               AD85719F07EF239100D5FC5B,
                                ADDF54AE06DE728A00C4E7F8,
                                ADDF54AA06DE727A00C4E7F8,
                                AD0130C106DE7697000910D8,
@@ -286,6 +386,7 @@
                                ADABC83307003DB900B582C7,
                                ADABC863070045C200B582C7,
                                ADABC89F07004CAE00B582C7,
+                               AD8573DA07EF567800D5FC5B,
                        );
                };
                ADDF54A406DE727A00C4E7F8 = {
@@ -368,7 +469,7 @@
                        );
                        buildSettings = {
                                DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 4.5.48;
+                               DYLIB_CURRENT_VERSION = 4.5.49;
                                FRAMEWORK_VERSION = A;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                GCC_PREFIX_HEADER = common.h;
@@ -419,6 +520,7 @@
                ADDF54AA06DE727A00C4E7F8 = {
                        children = (
                                ADDF54A906DE727A00C4E7F8,
+                               AD8573DB07EF567800D5FC5B,
                        );
                        isa = PBXGroup;
                        name = Products;

diff --git a/sope-xml/SaxObjC/SaxObjectDecoder.m b/sope-xml/SaxObjC/SaxObjectDecoder.m
index f9f904a4a54a4145b2743d68b105ef8ced8fadf2..4cf0e540991e3322810ae660f1752b6b9d00dfa7 100644 (file)
--- a/sope-xml/SaxObjC/SaxObjectDecoder.m
+++ b/sope-xml/SaxObjC/SaxObjectDecoder.m
@@ -92,11 +92,13 @@ static NSNull *null = nil;
 }
 
 - (void)dealloc {
-  [self reset];
-  [self->objectStack  release];
-  [self->mappingStack release];
-  [self->infoStack    release];
   [self->locator      release];
+  [self->rootObject   release];
+  [self->mapping      release];
+
+  [self->infoStack    release];
+  [self->mappingStack release];
+  [self->objectStack  release];
   [super dealloc];
 }
 
@@ -200,7 +202,8 @@ static NSNull *null = nil;
   info->namespace    = [_ns        copy];
   
   [self->infoStack addObject:info];
-  
+  [info release];
+
   /* determine mapping dictionary */
   
   if ((info->mapping = [self mappingForTag:_localName namespace:_ns]) == nil) {

diff --git a/sope-xml/SaxObjC/Version b/sope-xml/SaxObjC/Version
index 9c2df247a496f1acd4f3a8921372e447845bb7ef..704a8fa27d1346e21ef88404845e691f6c157dca 100644 (file)
--- a/sope-xml/SaxObjC/Version
+++ b/sope-xml/SaxObjC/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=48
+SUBMINOR_VERSION:=49