From owner-svn-ports-head@freebsd.org Sat Mar 28 12:31:01 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4A66227AD15; Sat, 28 Mar 2020 12:31:01 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48qJ3g4xTWz49LS; Sat, 28 Mar 2020 12:30:55 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6C60EC864; Sat, 28 Mar 2020 12:22:19 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02SCMJqP076150; Sat, 28 Mar 2020 12:22:19 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02SCMJB0076148; Sat, 28 Mar 2020 12:22:19 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <202003281222.02SCMJB0076148@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Sat, 28 Mar 2020 12:22:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529330 - in head/databases/py-mysqlclient: . files X-SVN-Group: ports-head X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: in head/databases/py-mysqlclient: . files X-SVN-Commit-Revision: 529330 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Mar 2020 12:31:02 -0000 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@FreeBSD.org +MAINTAINER= fluffy@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 +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;