Fix segfault with igbinary, fix phpredis#341

remicollet · michael-grunder · commit 0c4ddd90a6cf · 2014-10-04T07:19:14.000-07:00
diff --git a/library.c b/library.c
@@ -1730,11 +1730,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;

Original file line number	Diff line number	Diff line change
`@@ -1730,11 +1730,12 @@ redis_unserialize(RedisSock redis_sock, const char val, int val_len, zval **re`
`1730`	`1730`	`#ifdef HAVE_REDIS_IGBINARY`
`1731`	`1731`	`if(!*return_value) {`
`1732`	`1732`	`MAKE_STD_ZVAL(*return_value);`
	`1733`	`+ rv_free = 1;`
`1733`	`1734`	`}`
`1734`	`1735`	`if(igbinary_unserialize((const uint8_t *)val, (size_t)val_len, return_value TSRMLS_CC) == 0) {`
`1735`	`1736`	`return 1;`
`1736`	`1737`	`}`
`1737`		`- efree(*return_value);`
	`1738`	`+ if(rv_free==1) efree(*return_value);`
`1738`	`1739`	`#endif`
`1739`	`1740`	`return 0;`
`1740`	`1741`	`break;`