mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-30 12:49:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

gstmodule: Fix reference counts of Py_True and Py_False

Browse source 
When returning those values, extensions must take a new reference.

Fixes #33
This commit is contained in:
Mathieu Duponchelle 2020-02-26 13:53:17 +01:00
parent d37ca29515
commit e1f7c22d70
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gi/overrides/gstmodule.c
View file

@ -754,6 +754,7 @@ _remap (GstMapInfo * mapinfo, PyObject * py_mapinfo)
if (PyObject_SetAttrString (py_mapinfo, "__cmapinfo", PyCapsule_New (mapinfo, if (PyObject_SetAttrString (py_mapinfo, "__cmapinfo", PyCapsule_New (mapinfo,
"__cmapinfo", NULL)) == -1) "__cmapinfo", NULL)) == -1)
return NULL; return NULL;
Py_INCREF (Py_True);
return Py_True; return Py_True;
} }
@ -784,7 +785,7 @@ _gst_memory_override_map (PyObject * self, PyObject * args)
ok = gst_memory_map (memory, mapinfo, flags); ok = gst_memory_map (memory, mapinfo, flags);
if (!ok) { if (!ok) {
g_free (mapinfo); g_free (mapinfo);
return Py_False; goto err;
} }
success = _remap (mapinfo, py_mapinfo); success = _remap (mapinfo, py_mapinfo);
@ -793,6 +794,10 @@ _gst_memory_override_map (PyObject * self, PyObject * args)
g_free (mapinfo); g_free (mapinfo);
} }
return success; return success;
err:
Py_INCREF (Py_False);
return Py_False;
} }
static PyObject * static PyObject *
@ -839,9 +844,11 @@ _gst_memory_override_unmap (PyObject * self, PyObject * args)
g_free (mapinfo); g_free (mapinfo);
end: end:
Py_DECREF (mview); Py_DECREF (mview);
Py_INCREF (Py_True);
return Py_True; return Py_True;
err: err:
Py_INCREF (Py_False);
return Py_False; return Py_False;
} }
@ -860,7 +867,7 @@ _gst_buffer_override_map_range (PyObject * self, PyObject * args)
gst_buffer_type = pygobject_lookup_class (_gst_buffer_type); gst_buffer_type = pygobject_lookup_class (_gst_buffer_type);
if (!PyArg_ParseTuple (args, "O!OIii", gst_buffer_type, &py_buffer, if (!PyArg_ParseTuple (args, "O!OIii", gst_buffer_type, &py_buffer,
&py_mapinfo, &idx, &range, &flags)) &py_mapinfo, &idx, &range, &flags))
return Py_False; goto err;
/* Since Python does only support r/o or r/w it has to be changed to either */ /* Since Python does only support r/o or r/w it has to be changed to either */
flags = (flags & GST_MAP_WRITE) ? GST_MAP_READWRITE : GST_MAP_READ; flags = (flags & GST_MAP_WRITE) ? GST_MAP_READWRITE : GST_MAP_READ;
@ -873,7 +880,7 @@ _gst_buffer_override_map_range (PyObject * self, PyObject * args)
ok = gst_buffer_map_range (buffer, idx, range, mapinfo, flags); ok = gst_buffer_map_range (buffer, idx, range, mapinfo, flags);
if (!ok) { if (!ok) {
g_free (mapinfo); g_free (mapinfo);
return Py_False; goto err;
} }
success = _remap (mapinfo, py_mapinfo); success = _remap (mapinfo, py_mapinfo);
@ -882,6 +889,10 @@ _gst_buffer_override_map_range (PyObject * self, PyObject * args)
g_free (mapinfo); g_free (mapinfo);
} }
return success; return success;
err:
Py_INCREF (Py_False);
return Py_False;
} }
static PyObject * static PyObject *
@ -913,7 +924,7 @@ _gst_buffer_override_map (PyObject * self, PyObject * args)
ok = gst_buffer_map (buffer, mapinfo, flags); ok = gst_buffer_map (buffer, mapinfo, flags);
if (!ok) { if (!ok) {
g_free (mapinfo); g_free (mapinfo);
return Py_False; goto err;
} }
success = _remap (mapinfo, py_mapinfo); success = _remap (mapinfo, py_mapinfo);
@ -922,6 +933,10 @@ _gst_buffer_override_map (PyObject * self, PyObject * args)
g_free (mapinfo); g_free (mapinfo);
} }
return success; return success;
err:
Py_INCREF (Py_False);
return Py_False;
} }
static PyObject * static PyObject *
@ -970,9 +985,11 @@ _gst_buffer_override_unmap (PyObject * self, PyObject * args)
g_free (mapinfo); g_free (mapinfo);
end: end:
Py_DECREF (mview); Py_DECREF (mview);
Py_INCREF (Py_True);
return Py_True; return Py_True;
err: err:
Py_INCREF (Py_False);
return Py_False; return Py_False;
} }