Merge pull request #2625 from xrmx/2621-cherry-pick

Cherry pick a couple of commit from #2621
unbit · Apr 6, 2024 · 100603f · 100603f
2 parents c164fb9 + f321efc
commit 100603f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/plugins/python/python_plugin.c b/plugins/python/python_plugin.c
@@ -1778,8 +1778,10 @@ uint64_t uwsgi_python_rpc(void *func, uint8_t argc, char **argv, uint16_t argvs[
 	PyObject *pyargs = PyTuple_New(argc);
 	PyObject *ret;
 
-	if (!pyargs)
+	if (!pyargs) {
+		UWSGI_RELEASE_GIL;
 		return 0;
+	}
 
 	for (i = 0; i < argc; i++) {
 		PyTuple_SetItem(pyargs, i, PyString_FromStringAndSize(argv[i], argvs[i]));

diff --git a/valgrind/valgrind-generate-sups.sh b/valgrind/valgrind-generate-sups.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+pydir=${1:-/usr}
+
 
 gensup() {
     for SUP in Cond Free Leak Overlap Addr1 Addr2 Addr4 Addr8 Addr16 Value1 Value2 Value4 Value8 Value16 ; do
@@ -16,10 +18,10 @@ gensup() {
 
 while read SO ; do
     gensup libpython "$SO"
-done < <(find /usr/lib*/ -type f -name libpython*)
+done < <(find ${pydir}/lib*/ -type f -name libpython*)
 
 
 while read SO ; do
     gensup python "$SO"
-done < <(find /usr/lib*/python*/ -type f -name \*.so)
+done < <(find ${pydir}/lib*/python*/ -type f -name \*.so)