X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fdynbind.c;h=77dfd88d5988c7e061f688de39a819a4ef62b463;hb=0bb093a109ec94a021e413bd0ae6ae7fdf54d774;hp=5bed3599056172f5024d3cde2a2c00740a02bcc3;hpb=1600081cf1b71b3d0e2e40de1c1c124a3a4fd40c;p=sbcl.git

diff --git a/src/runtime/dynbind.c b/src/runtime/dynbind.c
index 5bed359..77dfd88 100644
--- a/src/runtime/dynbind.c
+++ b/src/runtime/dynbind.c
@@ -51,6 +51,9 @@ void bind_variable(lispobj symbol, lispobj value, void *th)
                 sym->tls_index=SymbolValue(FREE_TLS_INDEX,0);
                 SetSymbolValue(FREE_TLS_INDEX,
                                make_fixnum(fixnum_value(sym->tls_index)+1),0);
+                if(fixnum_value(sym->tls_index)>=TLS_SIZE) {
+                    lose("Thread local storage exhausted.");
+                }
             }
             release_spinlock(tls_index_lock);
             clear_pseudo_atomic_atomic(th);
@@ -95,7 +98,9 @@ unbind_to_here(lispobj *bsp,void *th)
 
         symbol = binding->symbol;
         if (symbol) {
-            SetTlSymbolValue(symbol, binding->value,thread);
+            if (symbol != UNBOUND_MARKER_WIDETAG) {
+                SetTlSymbolValue(symbol, binding->value,thread);
+            }
             binding->symbol = 0;
         }
     }