Merge pull request matplotlib#22650 from QuLogic/fix-ft2font-leak

oscargus · web-flow · commit af4046ed9a46 · 2022-03-15T09:07:25.000+01:00
Fix new leak in ft2font introduced in matplotlib#22604
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -291,7 +291,7 @@ static unsigned long read_from_file_callback(FT_Stream stream,
             return 1;  // Non-zero signals error, when count == 0.
         }
     }
-    return PyLong_AsUnsignedLong(PyLong_FromSsize_t(n_read));
+    return (unsigned long)n_read;
 }
 
 static void close_file_callback(FT_Stream stream)

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ static unsigned long read_from_file_callback(FT_Stream stream,`
`291`	`291`	`return 1; // Non-zero signals error, when count == 0.`
`292`	`292`	`}`
`293`	`293`	`}`
`294`		`- return PyLong_AsUnsignedLong(PyLong_FromSsize_t(n_read));`
	`294`	`+ return (unsigned long)n_read;`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`static void close_file_callback(FT_Stream stream)`