Fix call ordering to avoid callback crash on implicit close (confluentinc#265)

edenhill · edenhill · commit f669580c60bd · 2018-05-21T12:10:08.000+02:00
diff --git a/confluent_kafka/src/Admin.c b/confluent_kafka/src/Admin.c
@@ -40,8 +40,6 @@ static int Admin_clear (Handle *self) {
 static void Admin_dealloc (Handle *self) {
         PyObject_GC_UnTrack(self);
 
-        Admin_clear(self);
-
         if (self->rk) {
                 CallState cs;
                 CallState_begin(self, &cs);
@@ -51,6 +49,8 @@ static void Admin_dealloc (Handle *self) {
                 CallState_end(self, &cs);
         }
 
+        Admin_clear(self);
+
         Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
diff --git a/confluent_kafka/src/Consumer.c b/confluent_kafka/src/Consumer.c
@@ -28,7 +28,7 @@
  ****************************************************************************/
 
 
-static int Consumer_clear (Handle *self) {
+static void Consumer_clear0 (Handle *self) {
 	if (self->u.Consumer.on_assign) {
 		Py_DECREF(self->u.Consumer.on_assign);
 		self->u.Consumer.on_assign = NULL;
@@ -45,18 +45,20 @@ static int Consumer_clear (Handle *self) {
 	        rd_kafka_queue_destroy(self->u.Consumer.rkqu);
 	        self->u.Consumer.rkqu = NULL;
 	}
+}
 
-	Handle_clear(self);
-
-	return 0;
+static int Consumer_clear (Handle *self) {
+        Consumer_clear0(self);
+        Handle_clear(self);
+        return 0;
 }
 
 static void Consumer_dealloc (Handle *self) {
 	PyObject_GC_UnTrack(self);
 
-	Consumer_clear(self);
+        Consumer_clear0(self);
 
-	if (self->rk) {
+        if (self->rk) {
                 CallState cs;
 
                 CallState_begin(self, &cs);
@@ -71,6 +73,8 @@ static void Consumer_dealloc (Handle *self) {
                 CallState_end(self, &cs);
         }
 
+        Handle_clear(self);
+
         Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
diff --git a/confluent_kafka/src/Producer.c b/confluent_kafka/src/Producer.c
@@ -88,27 +88,29 @@ Producer_msgstate_destroy (struct Producer_msgstate *msgstate) {
 }
 
 
-static int Producer_clear (Handle *self) {
-	if (self->u.Producer.default_dr_cb) {
-		Py_DECREF(self->u.Producer.default_dr_cb);
-		self->u.Producer.default_dr_cb = NULL;
-	}
-	if (self->u.Producer.partitioner_cb) {
-		Py_DECREF(self->u.Producer.partitioner_cb);
-		self->u.Producer.partitioner_cb = NULL;
-	}
-
-	Handle_clear(self);
+static void Producer_clear0 (Handle *self) {
+        if (self->u.Producer.default_dr_cb) {
+                Py_DECREF(self->u.Producer.default_dr_cb);
+                self->u.Producer.default_dr_cb = NULL;
+        }
+        if (self->u.Producer.partitioner_cb) {
+                Py_DECREF(self->u.Producer.partitioner_cb);
+                self->u.Producer.partitioner_cb = NULL;
+        }
+}
 
-	return 0;
+static int Producer_clear (Handle *self) {
+        Producer_clear0(self);
+        Handle_clear(self);
+        return 0;
 }
 
 static void Producer_dealloc (Handle *self) {
 	PyObject_GC_UnTrack(self);
 
-	Producer_clear(self);
+        Producer_clear0(self);
 
-	if (self->rk) {
+        if (self->rk) {
                 CallState cs;
                 CallState_begin(self, &cs);
 
@@ -117,6 +119,8 @@ static void Producer_dealloc (Handle *self) {
                 CallState_end(self, &cs);
         }
 
+        Handle_clear(self);
+
 	Py_TYPE(self)->tp_free((PyObject *)self);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,6 @@ static int Admin_clear (Handle *self) {`
`40`	`40`	`static void Admin_dealloc (Handle *self) {`
`41`	`41`	`PyObject_GC_UnTrack(self);`
`42`	`42`
`43`		`- Admin_clear(self);`
`44`		`-`
`45`	`43`	`if (self->rk) {`
`46`	`44`	`CallState cs;`
`47`	`45`	`CallState_begin(self, &cs);`
`@@ -51,6 +49,8 @@ static void Admin_dealloc (Handle *self) {`
`51`	`49`	`CallState_end(self, &cs);`
`52`	`50`	`}`
`53`	`51`
	`52`	`+ Admin_clear(self);`
	`53`	`+`
`54`	`54`	`Py_TYPE(self)->tp_free((PyObject *)self);`
`55`	`55`	`}`
`56`	`56`