Merge branch 'maint'

* maint:
  Fix memory leak under Windows

2 files changed, 3 insertions, 1 deletions

diff --git a/src/uuid.cpp b/src/uuid.cpp
index f1dddf0..a119be0 100644
--- a/src/uuid.cpp
+++ b/src/uuid.cpp
@@ -41,6 +41,8 @@ zmq::uuid_t::uuid_t ()
 
 zmq::uuid_t::~uuid_t ()
 {
+    if (string_buf)
+        RpcStringFree (&string_buf);
 }
 
 const char *zmq::uuid_t::to_string ()
diff --git a/src/uuid.hpp b/src/uuid.hpp
index 871f827..a528baf 100644
--- a/src/uuid.hpp
+++ b/src/uuid.hpp
@@ -58,7 +58,7 @@ namespace zmq
         enum { uuid_string_len = 36 };
 
         //  Returns a pointer to buffer containing the textual
-        //  representation of the UUID. The caller is reponsible to
+        //  representation of the UUID. The callee is reponsible to
         //  free the allocated memory.
         const char *to_string ();