summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTaras Shpot <taras.shpot@eleks.com>2010-10-15 17:45:02 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-10-15 17:45:02 +0200
commit6e9520533395b19ed6f6a17de6f196aa5e93da9f (patch)
treee9c6a4480a7a152531ffbb78b5c28e4e876e8588 /src
parent5b44025602b6af952fc434a6e7bf8dff65a00be6 (diff)
Fix memory leak under Windows
The comment about memory ownership in uuid_t::to_string was misleading as on most platforms the buffer is a field of the object; The string allocated in UuidToString() wasn't properly freed with RpcStringFree() Signed-off-by: Taras Shpot <taras.shpot@eleks.com>
Diffstat (limited to 'src')
-rw-r--r--src/uuid.cpp2
-rw-r--r--src/uuid.hpp2
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 ();