[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 797375122e8aad4e1504b934a1b99ee267b71b4f
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 30 23:19:24 2004 +0000

    	Asking an NSInvocation for it's return value when return type
    	is void throws an exception.  Added check for void return types
    	to avoid this exception.
    
            Reviewed by Ken.
    
            * bindings/objc/objc_instance.mm:
            (ObjcInstance::invokeMethod):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6529 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 2e1d847..303ed78 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2004-04-30  Richard Williamson   <rjw at apple.com>
+
+	Asking an NSInvocation for it's return value when return type
+	is void throws an exception.  Added check for void return types
+	to avoid this exception.
+
+        Reviewed by Ken.
+
+        * bindings/objc/objc_instance.mm:
+        (ObjcInstance::invokeMethod):
+
 2004-04-29  Richard Williamson   <rjw at apple.com>
 
 	Fixed several bad problems with the ObjC bindings.  In particular, conversion
diff --git a/JavaScriptCore/bindings/objc/objc_instance.mm b/JavaScriptCore/bindings/objc/objc_instance.mm
index c9336fc..2861b94 100644
--- a/JavaScriptCore/bindings/objc/objc_instance.mm
+++ b/JavaScriptCore/bindings/objc/objc_instance.mm
@@ -181,8 +181,14 @@ NS_DURING
     // or a pointer.
     char buffer[1024];
     assert ([signature methodReturnLength] < 1024);
-    [invocation getReturnValue:buffer];
-    resultValue = convertObjcValueToValue (exec, buffer, objcValueType);
+    
+    if (*type == 'v') {
+        resultValue = Undefined();
+    }
+    else {
+        [invocation getReturnValue:buffer];
+        resultValue = convertObjcValueToValue (exec, buffer, objcValueType);
+    }
     
 NS_HANDLER
     

-- 
WebKit Debian packaging