summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2010-10-15 17:46:21 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-10-15 17:46:21 +0200
commit027eed41b8bf16cb8b2f9f83be1fe286b39e4fd8 (patch)
tree615ffb5fec30b7eec0b3069e36c59da1966a207c
parent2e9871ce34b5abc60ebc37c1887b76895537d62a (diff)
parent6e9520533395b19ed6f6a17de6f196aa5e93da9f (diff)
Merge branch 'maint'
* maint: Fix memory leak under Windows
-rw-r--r--AUTHORS1
-rw-r--r--src/uuid.cpp2
-rw-r--r--src/uuid.hpp2
3 files changed, 4 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 6106cbb..5606a9f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -41,6 +41,7 @@ Piotr Trojanek <piotr.trojanek@gmail.com>
Sebastian Otaegui <feniix@gmail.com>
Steven McCoy <steven.mccoy@miru.hk>
Tamara Kustarova <kustarova.tamara@gmail.com>
+Taras Shpot <taras.shpot@eleks.com>
Tero Marttila <terom@fixme.fi>
Terry Wilson <terry@logivox.net>
Vitaly Mayatskikh <v.mayatskih@gmail.com>
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 ();