[vlc-commits] preparser: remove wrong assertion

Romain Vimont git at videolan.org
Thu Nov 5 18:15:15 CET 2020


vlc | branch: master | Romain Vimont <rom1v at videolabs.io> | Tue Nov  3 11:31:57 2020 +0100| [6a42d1791aa50992feb4808bff9651732db8d10b] | committer: Alexandre Janniaux

preparser: remove wrong assertion

Assertion failure was reported on CI:
> test_libvlc_media: preparser/preparser.c:291: Interrupt: Assertion `!atomic_load(&task->interrupted)' failed.

The "interrupted" atomic flag set in Interrupt() may also be set
asynchronously on timeout in Parse(). This is expected (and harmless),
so just remove the assertion.

Signed-off-by: Alexandre Janniaux <ajanni at videolabs.io>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6a42d1791aa50992feb4808bff9651732db8d10b
---

 src/preparser/preparser.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/preparser/preparser.c b/src/preparser/preparser.c
index e5bd0b87cb..255efc6ce1 100644
--- a/src/preparser/preparser.c
+++ b/src/preparser/preparser.c
@@ -288,7 +288,6 @@ end:
 static void
 Interrupt(struct task *task)
 {
-    assert(!atomic_load(&task->interrupted));
     atomic_store(&task->interrupted, true);
 
     /* Wake up the preparser cond_wait */



More information about the vlc-commits mailing list