[Zodb-checkins] CVS: Cruft/ExtensionClass/src - Acquisition.c:1.61.4.2

[Andreas Jung]

Update of /cvs-repository/Cruft/ExtensionClass/src
In directory cvs.zope.org:/tmp/cvs-serv821/lib/Components/ExtensionClass/src

Modified Files:
      Tag: Zope-2_7-branch
	Acquisition.c 
Log Message:

      - Collector #1748: Fixed SIGSEGV in Acquisition


=== Cruft/ExtensionClass/src/Acquisition.c 1.61.4.1 => 1.61.4.2 ===
--- Cruft/ExtensionClass/src/Acquisition.c:1.61.4.1	Tue Oct 21 08:44:39 2003
+++ Cruft/ExtensionClass/src/Acquisition.c	Sat Apr  9 03:13:19 2005
@@ -466,6 +466,14 @@
 	    ASSIGN(r,PyECMethod_New(r,OBJECT(self)));
 	  else if (has__of__(r)) ASSIGN(r,__of__(r,OBJECT(self)));
 
+	  /* DM 2005-04-06: missing return value check leads to
+	     SIGSEGV when "filter" -- check added.
+	     Note that at other places, the filter is applied
+	     before the "__of__". This indicates that more
+	     is wrong (here or elsewhere).
+	  */
+	  if (! r) return r;
+
 	  if (filter)
 	    switch(apply_filter(filter,OBJECT(self),oname,r,extra,orig))
 	      {