Bug 1051122: Don't infinitely recurse in CodeAddressServiceStringAlloc::free. r=dbaron
authorKyle Huey <khuey@kylehuey.com>
Sun, 10 Aug 2014 09:27:23 -0700
changeset 198798 0382146dd6adbb0a7f87985b7091ec1e4256aa7a
parent 198797 a40fb5d2a1aa048b5c1ffb353f0d42e903a88e74
child 198799 878ede98eacbe14d3252a4a8d50c602fabe82c78
push id27286
push usernigelbabu@gmail.com
push dateMon, 11 Aug 2014 06:26:45 +0000
treeherdermozilla-central@8c4a1b3a2a8b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbaron
bugs1051122
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1051122: Don't infinitely recurse in CodeAddressServiceStringAlloc::free. r=dbaron
xpcom/base/nsTraceRefcnt.cpp
--- a/xpcom/base/nsTraceRefcnt.cpp
+++ b/xpcom/base/nsTraceRefcnt.cpp
@@ -230,17 +230,17 @@ public:
 private:
   typedef nsTHashtable<nsCharPtrHashKey> StringSet;
   StringSet mSet;
 };
 
 struct CodeAddressServiceStringAlloc MOZ_FINAL
 {
   static char* copy(const char* aStr) { return strdup(aStr); }
-  static void free(char* aPtr) { free(aPtr); }
+  static void free(char* aPtr) { ::free(aPtr); }
 };
 
 class CodeAddressServiceWriter MOZ_FINAL
 {
 public:
   explicit CodeAddressServiceWriter(FILE* aFile)
     : mFile(aFile)
   {