src: fix multi-base class ObjectWrap::Unwrap<T>()

Fix pointer unwrapping when T is a class with more than one base class.

Before this commit, the wrapped void* pointer was cast directly to T*
without going through ObjectWrap* first, possibly leading to a class
instance pointer that points to the wrong vtable.

This change required some cleanup in various files; some classes
used private rather than public inheritance, others didn't derive
from ObjectWrap at all...

Fixes #6188.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/node_stat_watcher.h b/src/node_stat_watcher.h
index fd38c8b42ff..9d5e1fd2826 100644
--- a/src/node_stat_watcher.h
+++ b/src/node_stat_watcher.h
@@ -30,7 +30,7 @@
 
 namespace node {
 
-class StatWatcher : ObjectWrap {
+class StatWatcher : public ObjectWrap {
  public:
   static void Initialize(v8::Handle<v8::Object> target);
   inline Environment* env() const { return env_; }