Remove an unnecessary null check in mlt_pool. (SF-216)

viacast · Oct 2, 2014 · 2e4a6c1 · 2e4a6c1
1 parent ee14445
commit 2e4a6c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/coccinelle/delete_if4.cocci b/coccinelle/delete_if4.cocci
@@ -2,7 +2,7 @@
 expression x;
 identifier release =~ "^(?x)
 (?:cJSON_InitHooks
-|  free
+|  (?:mlt_)?free
 |  mlt_(?:(?:animation
           |  cache(?:_item)?
           |  profile
@@ -21,7 +21,7 @@ identifier release =~ "^(?x)
 expression x;
 identifier release =~ "^(?x)
 (?:cJSON_InitHooks
-|  free
+|  (?:mlt_)?free
 |  mlt_(?:(?:animation
           |  cache(?:_item)?
           |  profile
@@ -42,7 +42,7 @@ identifier release =~ "^(?x)
 expression a, b;
 identifier release =~ "^(?x)
 (?:cJSON_InitHooks
-|  free
+|  (?:mlt_)?free
 |  mlt_(?:(?:animation
           |  cache(?:_item)?
           |  profile
@@ -62,7 +62,7 @@ identifier release =~ "^(?x)
 expression a, b;
 identifier release =~ "^(?x)
 (?:cJSON_InitHooks
-|  free
+|  (?:mlt_)?free
 |  mlt_(?:(?:animation
           |  cache(?:_item)?
           |  profile

diff --git a/src/framework/mlt_pool.c b/src/framework/mlt_pool.c
@@ -198,14 +198,9 @@ static void pool_return( void *ptr )
 			// Unlock the pool
 			pthread_mutex_unlock( &self->lock );
 
-			// Ensure that we don't clean up
-			ptr = NULL;
+			return;
 		}
-	}
 
-	// Tidy up - this will only occur if the returned item is incorrect
-	if ( ptr != NULL )
-	{
 		// Free the release itself
 		mlt_free( ( char * )ptr - sizeof( struct mlt_release_s ) );
 	}