fixed some edge condition

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

diff --git a/sope-xml/libxmlSAXDriver/ChangeLog b/sope-xml/libxmlSAXDriver/ChangeLog
index 05ee7eed1e0f46ef19504bca459f82c1e9be7c75..eb830b38abb89d5a47b79dd913482ff593396295 100644 (file)
--- a/sope-xml/libxmlSAXDriver/ChangeLog
+++ b/sope-xml/libxmlSAXDriver/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-14  Helge Hess  <helge.hess@skyrix.com>
+
+       * libxmlSAXDriver.m: improved 'activeDriver' handling in some edge
+         condition (v4.5.22)
+
 2005-08-16  Helge Hess  <helge.hess@opengroupware.org>
 
        * install into SaxObjC framework Resources when being used with OSX

diff --git a/sope-xml/libxmlSAXDriver/Version b/sope-xml/libxmlSAXDriver/Version
index 8f54e04e9a08c380a1ee4b1f5fb54b20b1352f37..b0de02fbc819c2769371427b4ccee38e20609ef4 100644 (file)
--- a/sope-xml/libxmlSAXDriver/Version
+++ b/sope-xml/libxmlSAXDriver/Version
@@ -1,3 +1,3 @@
 # version
 
-SUBMINOR_VERSION:=21
+SUBMINOR_VERSION:=22

diff --git a/sope-xml/libxmlSAXDriver/libxmlSAXDriver.m b/sope-xml/libxmlSAXDriver/libxmlSAXDriver.m
index 900f299d499da8d831ae773d5d476089b3ef28ca..17b1dfca90306d8330032f17d16a7e376e1dd422 100644 (file)
--- a/sope-xml/libxmlSAXDriver/libxmlSAXDriver.m
+++ b/sope-xml/libxmlSAXDriver/libxmlSAXDriver.m
@@ -82,7 +82,22 @@ extern xmlParserCtxtPtr xmlCreateMemoryParserCtxt(char *buffer, int size);
 
 @implementation libxmlSAXDriver
 
-static libxmlSAXDriver *activeDriver = nil;
+static libxmlSAXDriver *activeDriver = nil; // THREAD
+
+#define SETUP_ACTDRIVER \
+  { if (activeDriver != nil) { \
+      NSLog(@"ERROR(%s): %@ there is an active driver set (0x%08X), " \
+            @"override!", \
+            __PRETTY_FUNCTION__, self, activeDriver);\
+    }\
+    activeDriver = self;}
+
+#define TEARDOWN_ACTDRIVER \
+  { if (activeDriver == self) activeDriver = nil; \
+    else if (activeDriver != nil) {               \
+      NSLog(@"ERROR(%s): %@ activeDriver global var mixed up 0x%08X, " \
+            @"probably a THREAD issue.", \
+            __PRETTY_FUNCTION__, self, activeDriver); } }
 
 static void
 _startElement(libxmlSAXDriver *self, const xmlChar *name, const xmlChar **atts);
@@ -444,11 +459,7 @@ static xmlSAXHandler saxHandler = {
       }
     }
     
-    if (activeDriver != nil) {
-      NSLog(@"ERROR(%s): %@ there is an active driver set (%@), override !",
-            __PRETTY_FUNCTION__, self, activeDriver);
-    }
-    activeDriver = self;
+    SETUP_ACTDRIVER;
     
     self->ctxt = xmlCreateMemoryParserCtxt((void *)start, len);
     
@@ -458,14 +469,14 @@ static xmlSAXHandler saxHandler = {
       
       NSLog(@"%s: couldn't create memory parser ctx (src=0x%08X, len=%d) !",
             __PRETTY_FUNCTION__, src, len);
-      
-      if (activeDriver == self)
-        activeDriver = nil;
+    
+      TEARDOWN_ACTDRIVER;
       
       ui = nil;
-      e = (id)[SaxParseException exceptionWithName:@"SaxIOException"
-                                 reason:@"couldn't create memory parser context"
-                                 userInfo:ui];
+      e = (id)[SaxParseException
+                exceptionWithName:@"SaxIOException"
+                reason:@"couldn't create memory parser context"
+                userInfo:ui];
       
       [self->errorHandler fatalError:e];
       return;
@@ -493,11 +504,10 @@ static xmlSAXHandler saxHandler = {
     ((xmlParserCtxtPtr)self->ctxt)->sax = oldsax;
     ((xmlParserCtxtPtr)self->ctxt)->userData = NULL;
     xmlFreeParserCtxt(ctxt);
-    
-    if (activeDriver == self)
-      activeDriver = nil;
-    
-    if (src) { 
+
+    TEARDOWN_ACTDRIVER;
+
+    if (src != NULL) { 
       free(src); 
       src = NULL;
     }
@@ -593,16 +603,11 @@ static int mfclose(void *f) {
         [_sysId cString];
     }
     
-    if (activeDriver != nil) {
-      NSLog(@"WARNING(%s): %@ there is an active driver set (%@), override !",
-            __PRETTY_FUNCTION__, self, activeDriver);
-    }
-    activeDriver = self;
+    SETUP_ACTDRIVER;
     
     xmlParseDocument(self->ctxt);
     
-    if (activeDriver == self)
-      activeDriver = nil;
+    TEARDOWN_ACTDRIVER;
     
     if (((xmlParserCtxtPtr)self->ctxt)->input != NULL && [_sysId length] > 0) {
       ((xmlParserInputPtr)((xmlParserCtxtPtr)self->ctxt)->input)->filename =