Merge pull request #26424 from QuLogic/macos-none

greglucas · web-flow · commit 654213eb8717 · 2023-07-31T19:56:50.000-06:00
macos: Don't leak None in Timer cleanup
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -1903,20 +1903,26 @@ - (void)flagsChanged:(NSEvent *)event
     }
 }
 
-static PyObject*
-Timer__timer_stop(Timer* self)
+static void
+Timer__timer_stop_impl(Timer* self)
 {
     if (self->timer) {
         [self->timer invalidate];
         self->timer = NULL;
     }
+}
+
+static PyObject*
+Timer__timer_stop(Timer* self)
+{
+    Timer__timer_stop_impl(self);
     Py_RETURN_NONE;
 }
 
 static void
 Timer_dealloc(Timer* self)
 {
-    Timer__timer_stop(self);
+    Timer__timer_stop_impl(self);
     Py_TYPE(self)->tp_free((PyObject*)self);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1903,20 +1903,26 @@ - (void)flagsChanged:(NSEvent *)event`
`1903`	`1903`	`}`
`1904`	`1904`	`}`
`1905`	`1905`
`1906`		`-static PyObject*`
`1907`		`-Timer__timer_stop(Timer* self)`
	`1906`	`+static void`
	`1907`	`+Timer__timer_stop_impl(Timer* self)`
`1908`	`1908`	`{`
`1909`	`1909`	`if (self->timer) {`
`1910`	`1910`	`[self->timer invalidate];`
`1911`	`1911`	`self->timer = NULL;`
`1912`	`1912`	`}`
	`1913`	`+}`
	`1914`	`+`
	`1915`	`+static PyObject*`
	`1916`	`+Timer__timer_stop(Timer* self)`
	`1917`	`+{`
	`1918`	`+ Timer__timer_stop_impl(self);`
`1913`	`1919`	`Py_RETURN_NONE;`
`1914`	`1920`	`}`
`1915`	`1921`
`1916`	`1922`	`static void`
`1917`	`1923`	`Timer_dealloc(Timer* self)`
`1918`	`1924`	`{`
`1919`		`- Timer__timer_stop(self);`
	`1925`	`+ Timer__timer_stop_impl(self);`
`1920`	`1926`	`Py_TYPE(self)->tp_free((PyObject*)self);`
`1921`	`1927`	`}`
`1922`	`1928`