From 996c1ebfb5bb2b76b687f0a3aad75e43858c29d7 Mon Sep 17 00:00:00 2001
From: CaS <CaS@72102866-910b-0410-8b05-ffd578937521>
Date: Fri, 4 Jul 2003 17:34:48 +0000
Subject: [PATCH] Minor fix

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@17111 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                |  2 ++
 Source/NSDistantObject.m | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5e96819e1..f21a7bcdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
 	* Source/NSDistributedNotificationCenter.m: Use -setProtocolForProxy:
 	and implement dummy class to work around bug in old compilers.
 	* Tools/gdnc.m: ditto
+	* Source/NSDistantObject.m: Fix for calls to remote system where we
+	can get no method signature.
 
 2003-07-04  Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Source/NSDistantObject.m b/Source/NSDistantObject.m
index f7687ed89..13d71b5f9 100644
--- a/Source/NSDistantObject.m
+++ b/Source/NSDistantObject.m
@@ -35,14 +35,15 @@
 #include "Foundation/NSObjCRuntime.h"
 #include "Foundation/NSInvocation.h"
 
-#define DO_FORWARD_INVOCATION(_SELX, _ARG1)			\
+#define DO_FORWARD_INVOCATION(_SELX, _ARG1) ({			\
   sig = [self methodSignatureForSelector: @selector(_SELX)];	\
+  if (sig != nil) {						\
   inv = [NSInvocation invocationWithMethodSignature: sig];	\
   [inv setSelector: @selector(_SELX)];				\
   [inv setTarget: self];					\
   [inv setArgument: (void*)&_ARG1 atIndex: 2];			\
   [self forwardInvocation: inv];				\
-  [inv getReturnValue: &m]
+  [inv getReturnValue: &m]; }})
 
 
 static int	debug_proxy = 0;
@@ -842,7 +843,7 @@ enum
 	}
       else
 	{
-	  id		m;
+	  id		m = nil;
 #ifdef USE_FFCALL
 	  id		inv;
 	  id		sig;
@@ -992,7 +993,7 @@ static inline BOOL class_is_kind_of (Class self, Class aClassObject)
 - (BOOL) conformsToProtocol: (Protocol*)aProtocol
 {
 #ifdef USE_FFCALL
-  BOOL m;
+  BOOL m = NO;
   id inv, sig;
   DO_FORWARD_INVOCATION(conformsToProtocol:, aProtocol);
   return m;
@@ -1017,7 +1018,7 @@ static inline BOOL class_is_kind_of (Class self, Class aClassObject)
 - (BOOL) respondsToSelector: (SEL)aSelector
 {
 #ifdef USE_FFCALL
-  BOOL m;
+  BOOL m = NO;
   id inv, sig;
   DO_FORWARD_INVOCATION(respondsToSelector:, aSelector);
   return m;