Created
November 22, 2016 14:38
-
-
Save konstantin-kelemen/b42bb2119e5880baf44cec6690337e6b to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -Naur memcached-2.2.0/php_memcached.c memcached-2.2.0-patched/php_memcached.c | |
--- memcached-2.2.0/php_memcached.c 2014-04-01 10:23:39.000000000 +0000 | |
+++ memcached-2.2.0-patched/php_memcached.c 2016-11-22 14:24:06.648566336 +0000 | |
@@ -339,15 +339,11 @@ | |
{ | |
char *buffer = NULL; | |
- if (fci->object_ptr) { | |
- spprintf (&buffer, 0, "%s::%s", Z_OBJCE_P (fci->object_ptr)->name, fci_cache->function_handler->common.function_name); | |
- } else { | |
- if (Z_TYPE_P (fci->function_name) == IS_OBJECT) { | |
- spprintf (&buffer, 0, "%s", Z_OBJCE_P (fci->function_name)->name); | |
- } | |
- else { | |
- spprintf (&buffer, 0, "%s", Z_STRVAL_P (fci->function_name)); | |
- } | |
+ if (Z_TYPE_P (fci->function_name) == IS_OBJECT) { | |
+ spprintf (&buffer, 0, "%s", Z_OBJCE_P (fci->function_name)->name); | |
+ } | |
+ else { | |
+ spprintf (&buffer, 0, "%s", Z_STRVAL_P (fci->function_name)); | |
} | |
return buffer; | |
} | |
@@ -3702,9 +3698,6 @@ | |
{ | |
if (fci->size > 0) { | |
zval_ptr_dtor(&fci->function_name); | |
- if (fci->object_ptr != NULL) { | |
- zval_ptr_dtor(&fci->object_ptr); | |
- } | |
} | |
} | |
@@ -3755,9 +3748,6 @@ | |
MEMC_G(server.callbacks) [event].fci_cache = fci_cache; | |
Z_ADDREF_P (fci.function_name); | |
- if (fci.object_ptr) { | |
- Z_ADDREF_P (fci.object_ptr); | |
- } | |
} | |
RETURN_BOOL(rc); | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment