svn commit: r529330 - in head/databases/py-mysqlclient: . files

[Dima Panov]

Author: fluffy
Date: Sat Mar 28 12:22:18 2020
New Revision: 529330
URL: https://svnweb.freebsd.org/changeset/ports/529330

Log:
  databases/py-mysqlclient: Add some gc safety around _mysql__fetch_row
  
  - Users of gc.get_referrers() could cause a SystemError to be raised if this function is running in a different python thread.
  - While here, take maintainership
  
  Obtained from:	PyMySQL repo

Added:
  head/databases/py-mysqlclient/files/
  head/databases/py-mysqlclient/files/patch-gitc67dbd41f   (contents, props changed)
Modified:
  head/databases/py-mysqlclient/Makefile

Modified: head/databases/py-mysqlclient/Makefile
==============================================================================
--- head/databases/py-mysqlclient/Makefile	Sat Mar 28 12:11:29 2020	(r529329)
+++ head/databases/py-mysqlclient/Makefile	Sat Mar 28 12:22:18 2020	(r529330)
@@ -2,11 +2,12 @@
 
 PORTNAME=	mysqlclient
 DISTVERSION=	1.4.6
+PORTREVISION=	1
 CATEGORIES=	databases python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTVERSIONPREFIX=	v
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	fluffy at FreeBSD.org
 COMMENT=	MySQL database connector for Python
 
 LICENSE=	GPLv2

Added: head/databases/py-mysqlclient/files/patch-gitc67dbd41f
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/py-mysqlclient/files/patch-gitc67dbd41f	Sat Mar 28 12:22:18 2020	(r529330)
@@ -0,0 +1,32 @@
+From c67dbd41f13f5302120ad40fee94ea6c7ffc2bfc Mon Sep 17 00:00:00 2001
+From: Jason Fried <me at jasonfried.info>
+Date: Wed, 5 Feb 2020 03:38:25 -0800
+Subject: [PATCH] Add some gc safety around _mysql__fetch_row (#348)
+
+Users of gc.get_referrers() could cause a SystemError to be raised if this function is running in a different python thread.
+---
+ MySQLdb/_mysql.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/MySQLdb/_mysql.c b/MySQLdb/_mysql.c
+index 13280ac..1556fda 100644
+--- MySQLdb/_mysql.c
++++ MySQLdb/_mysql.c
+@@ -1373,9 +1373,15 @@ _mysql_ResultObject_fetch_row(
+     convert_row = row_converters[how];
+     if (maxrows) {
+         if (!(r = PyTuple_New(maxrows))) goto error;
+-        rowsadded = _mysql__fetch_row(self, &r, skiprows, maxrows,
+-                convert_row);
++
++        // see: https://docs.python.org/3/library/gc.html#gc.get_referrers
++        // This function can get a reference to the tuple r, and if that
++        // code is preempted while holding a ref to r, the _PyTuple_Resize
++        // will raise a SystemError because the ref count is 2.
++        PyObject_GC_UnTrack(r);
++        rowsadded = _mysql__fetch_row(self, &r, skiprows, maxrows, convert_row);
+         if (rowsadded == -1) goto error;
++        PyObject_GC_Track(r);
+     } else {
+         if (self->use) {
+             maxrows = 1000;