Merge branch 'master' into uinput

1 files changed, 9 insertions, 6 deletions

diff --git a/osc.c b/osc.c
index 40bc01c..018e040 100644
--- a/osc.c
+++ b/osc.c
@@ -501,17 +501,20 @@ static int backend_configure_instance(instance* inst, char* option, char* value)
 }
 
 static instance* backend_instance(){
-	instance* i = mm_instance();
-	osc_instance* data = calloc(1, sizeof(osc_instance));
-	data->fd = -1;
+	instance* inst = mm_instance();
+	if(!inst){
+		return NULL;
+	}
 
-	if(!i || !data){
+	osc_instance* data = calloc(1, sizeof(osc_instance));
+	if(!data){
 		fprintf(stderr, "Failed to allocate memory\n");
 		return NULL;
 	}
 
-	i->impl = data;
-	return i;
+	data->fd = -1;
+	inst->impl = data;
+	return inst;
 }
 
 static channel* backend_channel(instance* inst, char* spec){