Bug 974986 - Always specify stack address in SamplerStackFramePrintfRAII; r=BenWa
authorJim Chen <nchen@mozilla.com>
Mon, 24 Feb 2014 12:27:58 -0500
changeset 170563 5609571991994bbc2c55e5430b53b23378b87def
parent 170562 33f11ad7ef1ee565f40af4ed1ad289bc8ef0f437
child 170564 4e7eba19b5731b5d18cb2618719e6e966df7c7da
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewersBenWa
bugs974986
milestone30.0a1
Bug 974986 - Always specify stack address in SamplerStackFramePrintfRAII; r=BenWa
tools/profiler/GeckoProfilerImpl.h
--- a/tools/profiler/GeckoProfilerImpl.h
+++ b/tools/profiler/GeckoProfilerImpl.h
@@ -327,17 +327,17 @@ public:
       _snprintf(mDest, SAMPLER_MAX_STRING, "%s %s", aDefault, buff);
 #else
       ::vsnprintf(buff, SAMPLER_MAX_STRING, aFormat, args);
       ::snprintf(mDest, SAMPLER_MAX_STRING, "%s %s", aDefault, buff);
 #endif
       mHandle = mozilla_sampler_call_enter(mDest, this, true, line);
       va_end(args);
     } else {
-      mHandle = mozilla_sampler_call_enter(aDefault, nullptr, false, line);
+      mHandle = mozilla_sampler_call_enter(aDefault, this, false, line);
     }
   }
   ~SamplerStackFramePrintfRAII() {
     mozilla_sampler_call_exit(mHandle);
   }
 private:
   char mDest[SAMPLER_MAX_STRING];
   void* mHandle;