projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix issue where stale result set might end up being read (this has never been reporte...
[m6w6/libmemcached]
/
libmemcached
/
fetch.cc
diff --git
a/libmemcached/fetch.cc
b/libmemcached/fetch.cc
index 2b5b800693c495245a3265ff49acdf65e81c344c..27ea3a8413722f987cbb3eebeee503c9820b0703 100644
(file)
--- a/
libmemcached/fetch.cc
+++ b/
libmemcached/fetch.cc
@@
-155,10
+155,12
@@
memcached_result_st *memcached_fetch_result(memcached_st *ptr,
memcached_return_t *error)
{
memcached_return_t unused;
memcached_return_t *error)
{
memcached_return_t unused;
- if (not error)
+ if (error == NULL)
+ {
error= &unused;
error= &unused;
+ }
- if (
not ptr
)
+ if (
ptr == NULL
)
{
*error= MEMCACHED_INVALID_ARGUMENTS;
return NULL;
{
*error= MEMCACHED_INVALID_ARGUMENTS;
return NULL;
@@
-176,7
+178,7
@@
memcached_result_st *memcached_fetch_result(memcached_st *ptr,
// create one.
if (memcached_is_initialized(&ptr->result))
{
// create one.
if (memcached_is_initialized(&ptr->result))
{
- if (
not (result= memcached_result_create(ptr, NULL))
)
+ if (
(result= memcached_result_create(ptr, NULL)) == NULL
)
{
*error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
return NULL;
{
*error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
return NULL;