From c0e9660da5644ab6503a9ec91c10c429359452e4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 4 Oct 2014 09:40:56 +0200 Subject: php-pecl-redis: test build --- redis-igbinary.patch | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 redis-igbinary.patch (limited to 'redis-igbinary.patch') diff --git a/redis-igbinary.patch b/redis-igbinary.patch new file mode 100644 index 0000000..6af7538 --- /dev/null +++ b/redis-igbinary.patch @@ -0,0 +1,27 @@ +From aecfbfd650d6b504193d48f82a4a170ce3ce4cd6 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Fri, 3 Oct 2014 19:19:33 +0200 +Subject: [PATCH] Fix segfault with igbinary, fix #341 + +--- + library.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/library.c b/library.c +index 40d43fa..3e91e93 100644 +--- a/library.c ++++ b/library.c +@@ -1646,11 +1646,12 @@ redis_unserialize(RedisSock *redis_sock, const char *val, int val_len, zval **re + #ifdef HAVE_REDIS_IGBINARY + if(!*return_value) { + MAKE_STD_ZVAL(*return_value); ++ rv_free = 1; + } + if(igbinary_unserialize((const uint8_t *)val, (size_t)val_len, return_value TSRMLS_CC) == 0) { + return 1; + } +- efree(*return_value); ++ if(rv_free==1) efree(*return_value); + #endif + return 0; + break; -- cgit