Index: ossp-pkg/ex/ChangeLog
RCS File: /v/ossp/cvs/ossp-pkg/ex/ChangeLog,v
rcsdiff -q -kk '-r1.17' '-r1.18' -u '/v/ossp/cvs/ossp-pkg/ex/ChangeLog,v' 2>/dev/null
--- ChangeLog	2007/10/12 19:54:21	1.17
+++ ChangeLog	2007/10/12 19:57:56	1.18
@@ -13,7 +13,10 @@
 
   Changes between 1.0.5 and 1.0.6 (02-Oct-2005 to XX-xxx-2006)
 
-   *) ...
+   *) Fix example given under "MULTITHREADING ENVIRONMENTS"
+      in the manual page. The problem is that the context
+      can be still not associated and hence be NULL.
+      [Frank Hempel <red_socks@gmx.de>]
 
    *) Upgrade build environment to GNU shtool 2.0.7,
       GNU libtool 1.5.24 and GNU autoconf 2.61.
Index: ossp-pkg/ex/THANKS
RCS File: /v/ossp/cvs/ossp-pkg/ex/THANKS,v
rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/ex/THANKS,v' 2>/dev/null
--- THANKS	2003/01/30 11:02:38	1.3
+++ THANKS	2007/10/12 19:57:56	1.4
@@ -13,6 +13,7 @@
   bugfixes, hints, gave platform feedback, etc. (in alphabetical order):
 
   Michael van Elst    <mlelstv@dev.de.cw.net>
+  Frank Hempel        <red_socks@gmx.de>
   Thomas Lotterer     <thomas@lotterer.net>
   A Makarov           <makarov@tecon.ru>
   Michael Schloh      <michael@schloh.com>
Index: ossp-pkg/ex/ex.pod
RCS File: /v/ossp/cvs/ossp-pkg/ex/ex.pod,v
rcsdiff -q -kk '-r1.32' '-r1.33' -u '/v/ossp/cvs/ossp-pkg/ex/ex.pod,v' 2>/dev/null
--- ex.pod	2006/08/10 19:49:33	1.32
+++ ex.pod	2007/10/12 19:57:56	1.33
@@ -598,13 +598,20 @@
  /* callback: context fetching */
  static ex_ctx_t *pthread_ex_ctx(void)
  {
-     return (ex_ctx_t *)
-         pthread_getspecific(pthread_ex_ctx_key);
+     ex_ctx_t *ctx;
+
+     if ((ctx = (ex_ctx_t *)pthread_getspecific(pthread_ex_ctx_key)) == NULL)
+         return __ex_ctx_default();
+     return ctx;
  }
 
  /* callback: termination */
  static void pthread_ex_terminate(ex_t *e)
  {
+     ex_ctx_t *ctx;
+
+     if ((ctx = (ex_ctx_t *)pthread_getspecific(pthread_ex_ctx_key)) == NULL)
+         __ex_terminate_default(e);
      pthread_exit(e->ex_value);
  }