diff options
| author | Alexey Samsonov <samsonov@google.com> | 2013-02-15 19:22:49 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2013-02-15 19:22:49 +0000 |
| commit | 180e988700858a838e00fe9406f170502c203b85 (patch) | |
| tree | 771ac96cd08ceed94dd7ebb769aa2f89e802d697 /lib/asan/asan_mac.cc | |
| parent | e6b91fdad54c4c9a711b5149d65ea6a6f368d9ab (diff) | |
| download | compiler-rt-180e988700858a838e00fe9406f170502c203b85.tar.gz compiler-rt-180e988700858a838e00fe9406f170502c203b85.tar.bz2 compiler-rt-180e988700858a838e00fe9406f170502c203b85.tar.xz | |
[ASan] make variables unsigned to silence warnings - attempt 2
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@175285 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/asan/asan_mac.cc')
| -rw-r--r-- | lib/asan/asan_mac.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/asan/asan_mac.cc b/lib/asan/asan_mac.cc index e8e6b22b..154a33fc 100644 --- a/lib/asan/asan_mac.cc +++ b/lib/asan/asan_mac.cc @@ -131,7 +131,7 @@ void MaybeReexec() { CHECK(dladdr((void*)((uptr)__asan_init), &info)); char *dyld_insert_libraries = const_cast<char*>(GetEnv(kDyldInsertLibraries)); - sptr old_env_len = dyld_insert_libraries ? + uptr old_env_len = dyld_insert_libraries ? internal_strlen(dyld_insert_libraries) : 0; uptr fname_len = internal_strlen(info.dli_fname); if (!dyld_insert_libraries || @@ -171,7 +171,7 @@ void MaybeReexec() { // It's just the runtime library name - fine to unset the variable. LeakyResetEnv(kDyldInsertLibraries, NULL); } else { - sptr env_name_len = internal_strlen(kDyldInsertLibraries); + uptr env_name_len = internal_strlen(kDyldInsertLibraries); // Allocate memory to hold the previous env var name, its value, the '=' // sign and the '\0' char. char *new_env = (char*)allocator_for_env.Allocate( @@ -190,7 +190,7 @@ void MaybeReexec() { if (piece_start[0] == ':') piece_start++; piece_end = REAL(strchr)(piece_start, ':'); if (!piece_end) piece_end = dyld_insert_libraries + old_env_len; - if (piece_start - dyld_insert_libraries > old_env_len) break; + if ((uptr)(piece_start - dyld_insert_libraries) > old_env_len) break; uptr piece_len = piece_end - piece_start; // If the current piece isn't the runtime library name, append it to new_env. |