Merge branch 'hotfix/eval_timeout_segfault' into develop

michael-grunder · michael-grunder · commit 79ccf9aec4d9 · 2014-02-20T22:26:23.000-08:00
diff --git a/library.c b/library.c
@@ -1874,7 +1874,7 @@ redis_read_variant_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zv
 		default:
 			// Protocol error
 			zend_throw_exception_ex(redis_exception_ce, 0 TSRMLS_CC, "protocol error, got '%c' as reply-type byte\n", reply_type);
-			break;
+            return FAILURE;
 	}
 
 	IF_MULTI_OR_PIPELINE() {

Original file line number	Diff line number	Diff line change
`@@ -1874,7 +1874,7 @@ redis_read_variant_reply(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock, zv`
`1874`	`1874`	`default:`
`1875`	`1875`	`// Protocol error`
`1876`	`1876`	`zend_throw_exception_ex(redis_exception_ce, 0 TSRMLS_CC, "protocol error, got '%c' as reply-type byte\n", reply_type);`
`1877`		`- break;`
	`1877`	`+ return FAILURE;`
`1878`	`1878`	`}`
`1879`	`1879`
`1880`	`1880`	`IF_MULTI_OR_PIPELINE() {`