Merge r7578 "Fix retained object info leak." to trunk
Review URL: http://codereview.chromium.org/6813104
git-svn-id: http://v8.googlecode.com/svn/trunk@7579 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
diff --git a/src/global-handles.h b/src/global-handles.h
index 3b6b7b3..2171b2c 100644
--- a/src/global-handles.h
+++ b/src/global-handles.h
@@ -28,6 +28,8 @@
#ifndef V8_GLOBAL_HANDLES_H_
#define V8_GLOBAL_HANDLES_H_
+#include "../include/v8-profiler.h"
+
#include "list-inl.h"
namespace v8 {
@@ -57,6 +59,7 @@
}
void Dispose() {
+ if (info_ != NULL) info_->Dispose();
free(this);
}
diff --git a/src/version.cc b/src/version.cc
index 9ce5e37..120e564 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 2
#define BUILD_NUMBER 9
-#define PATCH_LEVEL 0
+#define PATCH_LEVEL 1
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0