Add proper guards for platform code

Do not expect that non-ARM code is automatically X86 code as it does not
have to be. Returns failure (not thunk) in other case.

Make sure that windows test code is not called on non-windows platforms.
Test code tests/test-dladdr.c is written to be validated on any platforms,
including non-windows.

2 files changed, 13 insertions, 4 deletions

diff --git a/src/dlfcn.c b/src/dlfcn.c
index 749c35f..522eed0 100644
--- a/src/dlfcn.c
+++ b/src/dlfcn.c
@@ -754,8 +754,10 @@ static BOOL is_import_thunk( const void *addr )
         && ( opCode2 & 0xffe003ff ) == 0xf9400210  /* ldr  x16, [x16, offset] */

         && opCode3 == 0xd61f0200                   /* br   x16 */

         ? TRUE : FALSE;

-#else

+#elif defined(_M_AMD64) || defined(_M_IX86) || defined(__x86_64__) || defined(__i386__)

     return *(USHORT *) addr == 0x25ff ? TRUE : FALSE;

+#else

+    return FALSE;

 #endif

 }

 

@@ -785,7 +787,7 @@ static void *get_address_from_import_address_table( void *iat, DWORD iat_size, c
 

     /* Calculate the final address */

     BYTE *ptr = (BYTE *) ( (ULONG64) thkp & ~0xfffull ) + page + offset;

-#else

+#elif defined(_M_AMD64) || defined(_M_IX86) || defined(__x86_64__) || defined(__i386__)

     /* Get offset from thunk table (after instruction 0xff 0x25)

      *   4018c8 <_VirtualQuery>: ff 25 4a 8a 00 00

      */

@@ -804,6 +806,8 @@ static void *get_address_from_import_address_table( void *iat, DWORD iat_size, c
      */

     BYTE *ptr = (BYTE *) offset;

 #endif

+#else

+    return NULL;

 #endif

 

     if( !is_valid_address( ptr ) || ptr < (BYTE *) iat || ptr > (BYTE *) iat + iat_size )

diff --git a/tests/test-dladdr.c b/tests/test-dladdr.c
index 5568f23..aa815b0 100644
--- a/tests/test-dladdr.c
+++ b/tests/test-dladdr.c
@@ -140,6 +140,7 @@ __declspec(dllexport)
 #endif
 int main(int argc, char **argv)
 {
+#ifdef _WIN32
 #if defined(_M_ARM64) || defined(__aarch64__)
     /* points to non reachable address */
     unsigned char zero_thunk_address[12] = { 0x10, 0x00, 0x00, 0x90, 0x10, 0x02, 0x40, 0xF9, 0x00, 0x02, 0x1F, 0xD6 };
@@ -147,13 +148,16 @@ int main(int argc, char **argv)
     unsigned char invalid_thunk_address[12] = { 0x10, 0x00, 0x00, 0xb0, 0x10, 0x06, 0x47, 0xF9, 0x00, 0x02, 0x1F, 0xD6 };
     /* no import thunk */
     unsigned char no_import_thunk[12] = { 0x11, 0x00, 0x00, 0xb0, 0x31, 0x06, 0x47, 0xF9, 0x20, 0x02, 0x1F, 0xD6 };
-#else
+#elif defined(_M_AMD64) || defined(_M_IX86) || defined(__x86_64__) || defined(__i386__)
     /* points to non reachable address */
     unsigned char zero_thunk_address[6] = { 0xFF, 0x25, 0x00, 0x00, 0x00, 0x00 };
     /* points to executable base */
     unsigned char invalid_thunk_address[6] = { 0xFF, 0x25, 0x00, 0x00, 0x40, 0x00 };
     /* no import thunk */
     unsigned char no_import_thunk[6] = { 0xFF, 0x26, 0x00, 0x00, 0x40, 0x00 };
+#else
+#error "thunk test cases are not defined for this architecture"
+#endif
 #endif
     int  result = 0;
     UNUSED(argv);
@@ -169,11 +173,12 @@ int main(int argc, char **argv)
     result |= check_dladdr( "function from executable", (void*)main, "main", Pass );
     result |= check_dladdr( "static function from executable", (void*)print_dl_info, "print_dl_info", Fail );
     result |= check_dladdr( "address with positive offset", ((char*)atoi)+1, "atoi", PassWithDifferentAddress );
+
+#ifdef _WIN32
     result |= check_dladdr( "zero address from import thunk", zero_thunk_address, "", NoInfo );
     result |= check_dladdr( "invalid address from import thunk", invalid_thunk_address, "", NoInfo );
     result |= check_dladdr( "no import thunk", no_import_thunk, "", NoInfo );
 
-#ifdef _WIN32
     result |= check_dladdr( "last entry in iat", (void*)VirtualQuery, "VirtualQuery", PassWithDifferentAddress );
 
     result |= check_dladdr ( "address through import thunk", (void*)GetModuleHandleA, "GetModuleHandleA", PassWithDifferentAddress );