Skip to content

Update a few PHP 7 issues #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkoppanen merged 5 commits into from
Sep 1, 2015
Merged

Update a few PHP 7 issues #169

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9f703c
Use strpprintf
laruence Feb 5, 2015
aa3bc57
Fixed mem issue (double free)
laruence Feb 12, 2015
4187e22
No more ZEND_CTOR_MAKE_NULL
rlerdorf Apr 23, 2015
650b67c
Update php_memcached.c
remicollet Jun 27, 2015
3c79a97
Merge pull request #2 from remicollet/patch-3
laruence Jun 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions php_memcached.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,8 +407,7 @@ static PHP_METHOD(Memcached, __construct)
zend_fcall_info fci = {0};
zend_fcall_info_cache fci_cache;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "|S!f!S", &persistent_id, &fci, &fci_cache, &conn_str) == FAILURE) {
ZEND_CTOR_MAKE_NULL();
if (zend_parse_parameters_throw(ZEND_NUM_ARGS(), "|S!f!S", &persistent_id, &fci, &fci_cache, &conn_str) == FAILURE) {
return;
}

Expand Down Expand Up @@ -1299,14 +1298,8 @@ static void php_memc_setMulti_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_ke
retry:
if (!by_key) {
status = memcached_set(m_obj->memc, str_key->val, str_key->len, payload, payload_len, expiration, flags);
if (!skey) {
zend_string_release(str_key);
}
} else {
status = memcached_set_by_key(m_obj->memc, server_key->val, server_key->len, str_key->val, str_key->len, payload, payload_len, expiration, flags);
if (!skey) {
zend_string_release(str_key);
}
}

if (php_memc_handle_error(i_obj, status) < 0) {
Expand Down Expand Up @@ -2760,11 +2753,9 @@ static PHP_METHOD(Memcached, getResultMessage)
case MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE:
case MEMCACHED_UNKNOWN_READ_FAILURE:
if (i_obj->memc_errno) {
char *str;
int str_len;
str_len = spprintf(&str, 0, "%s: %s", memcached_strerror(m_obj->memc, (memcached_return)i_obj->rescode),
strerror(i_obj->memc_errno));
RETURN_STRINGL(str, str_len);
zend_string *str = strpprintf(0, "%s: %s",
memcached_strerror(m_obj->memc, (memcached_return)i_obj->rescode), strerror(i_obj->memc_errno));
RETURN_STR(str);
}
/* Fall through */
default:
Expand Down Expand Up @@ -3128,7 +3119,7 @@ zend_bool s_serialize_value (enum memcached_serializer serializer, zval *value,
#ifdef HAVE_MEMCACHED_MSGPACK
case SERIALIZER_MSGPACK:
php_msgpack_serialize(buf, value);
if (!buf->c) {
if (!buf->s) {
php_error_docref(NULL, E_WARNING, "could not serialize value with msgpack");
return 0;
}
Expand Down