Changeset 1853 for trunk/src/kernel32/wintls.cpp

Timestamp:

Nov 27, 1999, 1:05:40 AM (26 years ago)

Author:

sandervl

Message:

TLS fix

File:

• trunk/src/kernel32/wintls.cpp (modified) (4 diffs)

trunk/src/kernel32/wintls.cpp

@@ -1 @@
-/* $Id: wintls.cpp,v 1.6 1999-11-09 19:22:33 sandervl Exp $ */
+/* $Id: wintls.cpp,v 1.7 1999-11-27 00:05:40 sandervl Exp $ */
 /*
  * Win32 TLS API functions
@@ -72 +72 @@
    dprintf(("tlsIndexAddr     %x", tlsIndexAddr));
    dprintf(("tlsCallbackAddr  %x", tlsCallBackAddr));
-   dprintf(("*tlsCallbackAddr %x", *tlsCallBackAddr));
+   dprintf(("*tlsCallbackAddr %x", (tlsCallBackAddr) ? *tlsCallBackAddr : 0));
    tibmem = (char *)VirtualAlloc(0, tlsTotalSize, MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE);
    if(tibmem == NULL) {
@@ -86 +86 @@
    *tlsIndexAddr = tlsIndex;
 
-   if((ULONG)*tlsCallBackAddr != 0) {
+   if(tlsCallBackAddr && (ULONG)*tlsCallBackAddr != 0) {
         pCallback = tlsCallBackAddr;
         while(*pCallback) {
@@ -112 +112 @@
    dprintf(("Win32ImageBase::tlsDetachThread for module %x, thread id %x", hinstance, GetCurrentThreadId()));
 
-   if((ULONG)*tlsCallBackAddr != 0) {
+   if(tlsCallBackAddr && (ULONG)*tlsCallBackAddr != 0) {
         pCallback = tlsCallBackAddr;
         while(*pCallback) {