xnu-6153.81.5.tar.gz

[apple/xnu.git] / libsyscall / mach / exc_catcher.c

diff --git a/libsyscall/mach/exc_catcher.c b/libsyscall/mach/exc_catcher.c
index 9915eb2a0daa939869eac31a2fe3d7c80704eea1..d24b486b6e2266b5c10b8340f67d68d3ce05461e 100644 (file)
--- a/libsyscall/mach/exc_catcher.c
+++ b/libsyscall/mach/exc_catcher.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1999-2010 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * Copyright (c) 1999-2010 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

- * 
+ *

  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in


@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.

- * 
+ *

  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.

- * 
+ *

  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,


@@ -22,7 +22,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.

- * 
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*


@@ -41,17 +41,17 @@
 
 __private_extern__ kern_return_t
 internal_catch_exception_raise(
 
 __private_extern__ kern_return_t
 internal_catch_exception_raise(

-    mach_port_t exception_port,
-    mach_port_t thread,
-    mach_port_t task,
-    exception_type_t exception,
-    exception_data_t code,
-    mach_msg_type_number_t codeCnt)
+       mach_port_t exception_port,
+       mach_port_t thread,
+       mach_port_t task,
+       exception_type_t exception,
+       exception_data_t code,
+       mach_msg_type_number_t codeCnt)

 {
 #if defined(__DYNAMIC__)
        static _libkernel_exc_raise_func_t exc_raise_func = (void*)-1;
 {
 #if defined(__DYNAMIC__)
        static _libkernel_exc_raise_func_t exc_raise_func = (void*)-1;

-       
-       if (exc_raise_func == ((void*)-1)) {
+
+       if (exc_raise_func == ((void*)-1) && _dlsym) {

                exc_raise_func = _dlsym(RTLD_DEFAULT, "catch_exception_raise");
        }
        if (exc_raise_func == 0) {
                exc_raise_func = _dlsym(RTLD_DEFAULT, "catch_exception_raise");
        }
        if (exc_raise_func == 0) {


@@ -64,4 +64,3 @@ internal_catch_exception_raise(
        return catch_exception_raise(exception_port, thread, task, exception, code, codeCnt);
 #endif
 }
        return catch_exception_raise(exception_port, thread, task, exception, code, codeCnt);
 #endif
 }

-