diff options
| author | Christopher Ferris <cferris@google.com> | 2014-01-29 08:11:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-29 08:11:02 +0000 |
| commit | 773c9ab74cc2e42f25fe16756e0b7a693b1d2cf5 (patch) | |
| tree | d6f3be3b034819fe0f1891f85dc28130e9e40904 /libbacktrace | |
| parent | a40636f33fe4f2dbd99e58c98609445ecf5870b8 (diff) | |
| parent | c96c29548fa0c933e5aa78116f90ff6be5c4fc39 (diff) | |
| download | system_core-773c9ab74cc2e42f25fe16756e0b7a693b1d2cf5.zip system_core-773c9ab74cc2e42f25fe16756e0b7a693b1d2cf5.tar.gz system_core-773c9ab74cc2e42f25fe16756e0b7a693b1d2cf5.tar.bz2 | |
am c96c2954: am a152ed73: Merge "Fix global pointing to local variable."
* commit 'c96c29548fa0c933e5aa78116f90ff6be5c4fc39':
Fix global pointing to local variable.
Diffstat (limited to 'libbacktrace')
| -rw-r--r-- | libbacktrace/UnwindMap.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libbacktrace/UnwindMap.cpp b/libbacktrace/UnwindMap.cpp index 9c8193b..03bb192 100644 --- a/libbacktrace/UnwindMap.cpp +++ b/libbacktrace/UnwindMap.cpp @@ -33,7 +33,7 @@ // of maps using the same map cursor. //------------------------------------------------------------------------- static pthread_mutex_t g_map_mutex = PTHREAD_MUTEX_INITIALIZER; -static unw_map_cursor_t* g_map_cursor = NULL; +static unw_map_cursor_t g_map_cursor; static int g_map_references = 0; UnwindMap::UnwindMap(pid_t pid) : BacktraceMap(pid) { @@ -64,11 +64,11 @@ bool UnwindMap::Build() { // Set the local address space to this cursor map. unw_map_set(unw_local_addr_space, &map_cursor_); g_map_references = 1; - g_map_cursor = &map_cursor_; + g_map_cursor = map_cursor_; } } else { g_map_references++; - map_cursor_ = *g_map_cursor; + map_cursor_ = g_map_cursor; } pthread_mutex_unlock(&g_map_mutex); } else { |