Merge branch 'hotfix/fix-deadlock-on-receive'

RidgeRun · Dec 9, 2021 · ab4d5b7 · ab4d5b7
2 parents fa523d5 + 192d580
commit ab4d5b7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ dnl required version of autoconf
 AC_PREREQ([2.53])
 
 dnl Gstreamer's daemon package name and version
-AC_INIT([gstd],[0.13.0])
+AC_INIT([gstd],[0.13.1])
 
 dnl required version of gstreamer and gst-plugins-base
 GST_REQUIRED=1.0.0

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+gstd (0.13.1-1) unstable; urgency=medium
+
+  * Fix deadlock when a socket dies or closes incorrectly on PyGstc
+
+ -- RidgeRun Engineering <[email protected]>  Wed, 08 Dec 08:30:00  -0600
+
 gstd (0.13.0-1) unstable; urgency=medium
 
   * Add libgstc support to get pipeline state

diff --git a/libgstc/python/pygstc/tcp.py b/libgstc/python/pygstc/tcp.py
@@ -176,6 +176,11 @@ def _recvall(self, sock, timeout):
             except socket.error as e:
                 raise TimeoutError from e
 
+            # When a connection dies, the socket does not close properly and it
+            # returns immediately with an empty string. So, check that first.
+            if len(newbuf) == 0:
+                break
+
             if self._terminator in newbuf:
                 buf += newbuf[:newbuf.find(self._terminator)]
                 break

diff --git a/libgstc/python/setup.py b/libgstc/python/setup.py
@@ -33,7 +33,7 @@
 
 setup(
     name='pygstc',
-    version='0.2.0',
+    version='0.2.1',
     description='Python GStreamer Daemon Client',
     long_description='Python GStreamer Daemon Client',
     long_description_content_type='text/markdown',

diff --git a/meson.build b/meson.build
@@ -1,5 +1,5 @@
 project('gstd', 'c',
-  version : '0.13.0',
+  version : '0.13.1',
   meson_version : '>= 0.50',)
 
 gstd_version = meson.project_version()