More super init fixes

Author: rfm

Source/Additions/GSXML.m

@@ -635,10 +635,13 @@ - (id) _initFrom: (void*)data parent: (id)p ownsLib: (BOOL)f
       DESTROY(self);
       return nil;
     }
-  lib = data;
-  _ownsLib = f;
-  ((xmlNodePtr)(lib))->_private = self;
-  ASSIGN(_parent, p);
+  if (nil != (self = [super init]))
+    {
+      lib = data;
+      _ownsLib = f;
+      ((xmlNodePtr)(lib))->_private = self;
+      ASSIGN(_parent, p);
+    }
   return self;
 }
 @end
@@ -1690,15 +1693,18 @@ @implementation GSXMLNode (GSPrivate)
  */
 - (id) _initFrom: (void*)data parent: (id)p
 {
-  if (data == NULL)
+  if (nil != (self = [super init]))
     {
-      NSLog(@"%@ - no data for initialization",
-	NSStringFromClass([self class]));
-      DESTROY(self);
-      return nil;
+      if (data == NULL)
+	{
+	  NSLog(@"%@ - no data for initialization",
+	    NSStringFromClass([self class]));
+	  DESTROY(self);
+	  return nil;
+	}
+      lib = data;
+      ASSIGN(_parent, p);
     }
-  lib = data;
-  ASSIGN(_parent, p);
   return self;
 }
 - (void) _setOwnsLib: (BOOL)f
@@ -2082,25 +2088,28 @@ - (id) init
  */
 - (id) initWithSAXHandler: (GSSAXHandler*)handler
 {
-  if (handler == nil)
-    {
-      saxHandler = [GSTreeSAXHandler new];
-    }
-  else if ([handler isKindOfClass: [GSSAXHandler class]] == YES)
-    {
-      saxHandler = RETAIN(handler);
-    }
-  else
-    {
-      NSLog(@"Bad GSSAXHandler object passed to GSXMLParser initialiser");
-      DESTROY(self);
-      return nil;
-    }
-  [saxHandler _setParser: self];
-  if ([self _initLibXML] == NO)
+  if (nil != (self = [super init]))
     {
-      DESTROY(self);
-      return nil;
+      if (handler == nil)
+	{
+	  saxHandler = [GSTreeSAXHandler new];
+	}
+      else if ([handler isKindOfClass: [GSSAXHandler class]] == YES)
+	{
+	  saxHandler = RETAIN(handler);
+	}
+      else
+	{
+	  NSLog(@"Bad GSSAXHandler object passed to GSXMLParser initialiser");
+	  DESTROY(self);
+	  return nil;
+	}
+      [saxHandler _setParser: self];
+      if ([self _initLibXML] == NO)
+	{
+	  DESTROY(self);
+	  return nil;
+	}
     }
   return self;
 }
@@ -2181,8 +2190,10 @@ - (id) initWithSAXHandler: (GSSAXHandler*)handler
       DESTROY(self);
       return nil;
     }
-  src = [data copy];
-  self = [self initWithSAXHandler: handler];
+  if (nil != (self = [self initWithSAXHandler: handler]))
+    {
+      src = [data copy];
+    }
   return self;
 }
 
@@ -3976,11 +3987,14 @@ - (id) init
 - (id) _initWithNativePointer: (xmlXPathObject *)lib
 		      context: (GSXPathContext *)context
 {
-  _lib = lib;
-  /* We RETAIN our context because we might be holding references to nodes
-   * which belong to the document, and we must make sure the document is
-   * not freed before we are.  */
-  ASSIGN (_context, context);
+  if (nil != (self = [super init]))
+    {
+      _lib = lib;
+      /* We RETAIN our context because we might be holding references to nodes
+       * which belong to the document, and we must make sure the document is
+       * not freed before we are.  */
+      ASSIGN (_context, context);
+    }
   return self;
 }
 
@@ -4165,10 +4179,12 @@ @implementation GSXPathContext
  */
 - (id) initWithDocument: (GSXMLDocument *)d
 {
-  ASSIGN (_document, d);
-  _lib = xmlXPathNewContext ([_document lib]);
-  ((xmlXPathContext*)_lib)->node = xmlDocGetRootElement ([_document lib]);
-
+  if (nil != (self = [super init]))
+    {
+      ASSIGN (_document, d);
+      _lib = xmlXPathNewContext ([_document lib]);
+      ((xmlXPathContext*)_lib)->node = xmlDocGetRootElement ([_document lib]);
+    }
   return self;
 }