Merge branch 'maint'

* maint:
  Fix memory leak under Windows
This commit is contained in:
Martin Sustrik
2010-10-15 17:46:21 +02:00
3 changed files with 4 additions and 1 deletions

View File

@@ -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>

View File

@@ -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 ()

View File

@@ -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 ();