[compiler-rt] r200468 - [sanitizer] Fix typo that breaks shmctl() interceptor.

[Evgeniy Stepanov]

Author: eugenis
Date: Thu Jan 30 08:31:26 2014
New Revision: 200468

URL: http://llvm.org/viewvc/llvm-project?rev=200468&view=rev
Log:
[sanitizer] Fix typo that breaks shmctl() interceptor.

https://code.google.com/p/address-sanitizer/issues/detail?id=259

Modified:
    compiler-rt/trunk/lib/asan/lit_tests/TestCases/Linux/shmctl.cc
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc

Modified: compiler-rt/trunk/lib/asan/lit_tests/TestCases/Linux/shmctl.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/lit_tests/TestCases/Linux/shmctl.cc?rev=200468&r1=200467&r2=200468&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/lit_tests/TestCases/Linux/shmctl.cc (original)
+++ compiler-rt/trunk/lib/asan/lit_tests/TestCases/Linux/shmctl.cc Thu Jan 30 08:31:26 2014
@@ -15,4 +15,10 @@ int main() {
   printf("shm_segsz: %zd\n", ds.shm_segsz);
   assert(ds.shm_segsz == 4096);
   assert(-1 != shmctl(id, IPC_RMID, 0));
+
+  struct shm_info shmInfo;
+  res = shmctl(0, SHM_INFO, (struct shmid_ds *)&shmInfo);
+  assert(res > -1);
+  
+  return 0;
 }

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc?rev=200468&r1=200467&r2=200468&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc Thu Jan 30 08:31:26 2014
@@ -193,7 +193,7 @@ namespace __sanitizer {
   int shmctl_ipc_stat = (int)IPC_STAT;
   int shmctl_ipc_info = (int)IPC_INFO;
   int shmctl_shm_info = (int)SHM_INFO;
-  int shmctl_shm_stat = (int)SHM_INFO;
+  int shmctl_shm_stat = (int)SHM_STAT;
 #endif
 
   int map_fixed = MAP_FIXED;