Fix segfault in _unserialize when we get badly formed data

michael-grunder · michael-grunder · commit e89d38554a9a · 2012-05-19T15:08:11.000-07:00
diff --git a/redis.c b/redis.c
@@ -5951,6 +5951,9 @@ PHP_METHOD(Redis, script) {
 		RETURN_FALSE;
 	}
 
+	// Free our alocated arguments
+	efree(z_args);
+
 	// Kick off our request
 	REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len);
 	IF_ATOMIC() {
@@ -6080,10 +6083,11 @@ PHP_METHOD(Redis, _unserialize) {
 	if(redis_sock->serializer != REDIS_SERIALIZER_NONE) {
 		zval *z_ret = NULL;
 		if(redis_unserialize(redis_sock, value, value_len, &z_ret TSRMLS_CC) == 0) {
+			// Badly formed input, throw an execption
 			zend_throw_exception(redis_exception_ce, "Invalid serialized data, or unserialization error", 0 TSRMLS_CC);
 			RETURN_FALSE;
 		}
-		RETURN_ZVAL(z_ret, 0, 0);
+		RETURN_ZVAL(z_ret, 0, 1);
 	} else {
 		// Just return the value that was passed to us
 		RETURN_STRINGL(value, value_len, 1);
@@ -6109,7 +6113,6 @@ PHP_METHOD(Redis, getLastError) {
 	// Return our last error or NULL if we don't have one
 	if(redis_sock->err != NULL && redis_sock->err_len > 0) {
 		RETURN_STRING(redis_sock->err, 1);
-		//RETURN_STRING(redis_sock->err); // , redis_sock->err_len-1, 1);
 	} else {
 		RETURN_NULL();
 	}
diff --git a/tests/TestRedis.php b/tests/TestRedis.php
@@ -2995,9 +2995,7 @@ public function testEval() {
 		$this->redis->sadd('myset', 'f');
 
 		// Basic keys
-		$this->redis->del('key1');
 		$this->redis->set('key1', 'hello, world');
-		$this->redis->del('key2');
 		$this->redis->set('key2', 'hello again!');
 
 		// Use a script to return our list, and verify its response
@@ -3077,7 +3075,7 @@ public function testEvalSHA() {
     	$this->assertFalse($this->redis->evalsha('some-random-data'));
 
     	// Load a script
-    	$cb  = uniqid();
+    	$cb  = uniqid(); // To ensure the script is new
     	$scr = "local cb='$cb' return 1";
     	$sha = sha1($scr);
 
diff --git a/tests/test.php b/tests/test.php
@@ -35,8 +35,24 @@ public static function run($className) {
 		$rc = new ReflectionClass($className);
 		$methods = $rc->GetMethods(ReflectionMethod::IS_PUBLIC);
 
+$sub_scr = array('Eval','Unserialize','Dump','Script');
+
+
 		foreach($methods as $m) {
 
+$do_run = false;
+foreach($sub_scr as $sub) {
+	if(strpos($m->name, $sub) !== false) {
+		$do_run = true;
+		break;
+	}
+}
+if(!$do_run) continue;
+/*if(strpos($m->name, 'Eval') === false && strpos($m->name, 'Unserialize') === false &&
+   strpos($m->name, 'Dump') === false strpos($m->name, 'Script') === false) {
+	echo $m->name . "\n";
+	continue;
+}*/
 			$name = $m->name;
 			if(substr($name, 0, 4) !== 'test')
 				continue;
