Updated CDetour code in TF2 extension to prevent crashes with spies. Updated windows sig.

extensions/tf2/asm/asm.c

@@ -1,5 +1,91 @@
 #include "asm.h"
 
+#ifndef WIN32
+#define _GNU_SOURCE
+#include <dlfcn.h>
+#include <string.h>
+
+#define REG_EAX			0
+#define REG_ECX			1
+#define REG_EDX			2
+#define REG_EBX			3
+
+#define IA32_MOV_REG_IMM		0xB8	// encoding is +r <imm32>
+#endif
+
+extern void Msg( const char *, ... );
+
+/**
+* Checks if a call to a fpic thunk has just been written into dest.
+* If found replaces it with a direct mov that sets the required register to the value of pc.
+*
+* @param dest		Destination buffer where a call opcode + addr (5 bytes) has just been written.
+* @param pc		The program counter value that needs to be set (usually the next address from the source).
+* @noreturn
+*/
+void check_thunks(unsigned char *dest, unsigned char *pc)
+{
+#if defined WIN32
+	return;
+#else
+	/* Step write address back 4 to the start of the function address */
+	unsigned char *writeaddr = dest - 4;
+	unsigned char *calloffset = *(unsigned char **)writeaddr;
+	unsigned char *calladdr = (unsigned char *)(dest + (unsigned int)calloffset);
+
+	/* Lookup name of function being called */
+	if ((*calladdr == 0x8B) && (*(calladdr+2) == 0x24) && (*(calladdr+3) == 0xC3))
+	{
+		//a thunk maybe?
+		char movByte = IA32_MOV_REG_IMM;
+
+		/* Calculate the correct mov opcode */
+		switch (*(calladdr+1))
+		{
+		case 0x04:
+			{
+				movByte += REG_EAX;
+				break;
+			}
+		case 0x1C:
+			{
+				movByte += REG_EBX;
+				break;
+			}
+		case 0x0C:
+			{
+				movByte += REG_ECX;
+				break;
+			}
+		case 0x14:
+			{
+				movByte += REG_EDX;
+				break;
+			}
+		default:
+			{
+				Msg("Unknown thunk: %c\n", *(calladdr+1));
+				break;
+			}
+		}
+
+		/* Move our write address back one to where the call opcode was */
+		writeaddr--;
+
+
+		/* Write our mov */
+		*writeaddr = movByte;
+		writeaddr++;
+
+		/* Write the value - The provided program counter value */
+		*(void **)writeaddr = (void *)pc;
+		writeaddr += 4;
+	}
+
+	return;
+#endif
+}
+
 //if dest is NULL, returns minimum number of bytes needed to be copied
 //if dest is not NULL, it will copy the bytes to dest as well as fix CALLs and JMPs
 //http://www.devmaster.net/forums/showthread.php?t=2311
@@ -195,9 +281,15 @@ int copy_bytes(unsigned char *func, unsigned char* dest, int required_len) {
 					//Fix CALL/JMP offset
 					if ((opcode & 0xFE) == 0xE8) {
 						if (operandSize == 4)
+						{
 							*(long*)dest = ((func + *(long*)func) - dest);
+
+							//pRED* edit. func is the current address of the call address, +4 is the next instruction, so the value of $pc
+							check_thunks(dest+4, func+4);
+						}
 						else
 							*(short*)dest = ((func + *(short*)func) - dest);
+
 					} else {
 						if (operandSize == 4)
 							*(unsigned long*)dest = *(unsigned long*)func;

extensions/tf2/asm/asm.h

@@ -17,6 +17,8 @@
 extern "C" {
 #endif
 
+void check_thunks(unsigned char *dest, unsigned char *pc);
+
 //if dest is NULL, returns minimum number of bytes needed to be copied
 //if dest is not NULL, it will copy the bytes to dest as well as fix CALLs and JMPs
 //http://www.devmaster.net/forums/showthread.php?t=2311