commit a152ed734f179ee2748d306f2eb57acbb4df1ace
author Christopher Ferris <cferris@google.com> Wed Jan 29 06:29:58 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 29 06:29:58 2014 +0000
tree edcb337dc4c7b125ccf9ec5c9f2f19cbf6089f8e
parent 6e34793b9cf11237670a5daa320cd784f7442532
parent 2b4ae52a56e175cc64baaa6c70412d06411d7af0

Merge "Fix global pointing to local variable."

libbacktrace/UnwindMap.cpp

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 @@
         // 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 {