projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge from trunk.
[awesomized/libmemcached]
/
libmemcached
/
string.cc
diff --git
a/libmemcached/string.cc
b/libmemcached/string.cc
index 6f3b9c1c571a4e5e9ccc5685eb59a6bcb35ec3ea..0e17484055c5e6356073b4458a07d1ce426f4cf1 100644
(file)
--- a/
libmemcached/string.cc
+++ b/
libmemcached/string.cc
@@
-88,7
+88,7
@@
memcached_string_st *memcached_string_create(memcached_st *memc, memcached_strin
{
WATCHPOINT_ASSERT(self->options.is_initialized == false);
{
WATCHPOINT_ASSERT(self->options.is_initialized == false);
-
self->options.is_allocated= false
;
+
memcached_set_allocated(self, false)
;
}
else
{
}
else
{
@@
-99,7
+99,7
@@
memcached_string_st *memcached_string_create(memcached_st *memc, memcached_strin
return NULL;
}
return NULL;
}
-
self->options.is_allocated= true
;
+
memcached_set_allocated(self, true)
;
}
self->root= memc;
}
self->root= memc;
@@
-107,7
+107,10
@@
memcached_string_st *memcached_string_create(memcached_st *memc, memcached_strin
if (memcached_failed(_string_check(self, initial_size)))
{
if (memcached_failed(_string_check(self, initial_size)))
{
- libmemcached_free(memc, self);
+ if (memcached_is_allocated(self))
+ {
+ libmemcached_free(memc, self);
+ }
return NULL;
}
return NULL;
}